From cfb7e2f8cdc2de0ee1f0e80ed6103b8ab9ac1903 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Wed, 28 Aug 2024 21:52:05 +0000
Subject: [PATCH] update

---
 .../sage/.devcontainer/Dockerfile             | 14 ++++++++------
 .../sage/.devcontainer/devcontainer.json      | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tools/devcontainers/sage/.devcontainer/Dockerfile b/tools/devcontainers/sage/.devcontainer/Dockerfile
index d57cd9fcaf..107f9b6639 100644
--- a/tools/devcontainers/sage/.devcontainer/Dockerfile
+++ b/tools/devcontainers/sage/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG imageVersion=jammy-20240227
+ARG imageVersion=jammy-20240808
 FROM ubuntu:$imageVersion
 
 # Safer bash scripts with 'set -euxo pipefail'
@@ -52,7 +52,7 @@ RUN groupadd docker \
     xz-utils tk-dev libffi-dev liblzma-dev \
     # Required by Hadolint
     shellcheck \
-  # Add Node.js repository
+  # Add Node.js
   && curl -fsSL https://deb.nodesource.com/setup_${nodeVersionMajor}.x -o nodesource_setup.sh \
   && bash nodesource_setup.sh \
   # Add Hadolint
@@ -79,8 +79,8 @@ RUN groupadd docker \
   # Fix Vault CLI
   # See https://github.com/hashicorp/vault/issues/10924
   && setcap -r /usr/bin/vault \
-  # Instal pnpm
-  && corepack install --global "pnpm@${pnpmVersion}" \
+  # Enable corepack
+  && corepack enable \
   # Install @devcontainers/cli
   && npm install -g "@devcontainers/cli@${devcontainerCliVersion}" \
   # Install act
@@ -143,7 +143,9 @@ RUN useradd -m $user \
     "  . ./dev-env.sh" \
     "  workspace-initialize-env" \
     "fi" \
-    "" | tee -a "/home/$user/.bashrc"
+    "" | tee -a "/home/$user/.bashrc" \
+  # Install the default version of pnpm
+  && corepack install --global "pnpm@${pnpmVersion}"
 
 # Install SonarScanner CLI
 ARG SONAR_SCANNER_HOME=/opt/sonar-scanner
@@ -165,7 +167,7 @@ RUN npx playwright@${playwrightVersion} install --with-deps \
     chromium \
     firefox \
     webkit \
-  # Install pyenv as the user
+  # Install pyenv as the non-root user
   && curl https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash -
 
 # Install Python environments
diff --git a/tools/devcontainers/sage/.devcontainer/devcontainer.json b/tools/devcontainers/sage/.devcontainer/devcontainer.json
index 209ea53e6a..98e4d0ddd9 100644
--- a/tools/devcontainers/sage/.devcontainer/devcontainer.json
+++ b/tools/devcontainers/sage/.devcontainer/devcontainer.json
@@ -1,13 +1,16 @@
 {
   "name": "Sage Dev Container",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"imageVersion": "jammy-20230624",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      "imageVersion": "jammy-20240808",
       "devcontainerVersion": "${localEnv:DEVCONTAINER_VERSION}"
-		}
-	},
-	"remoteUser": "vscode",
+    }
+  },
+  "remoteUser": "vscode",
   "shutdownAction": "stopContainer",
-  "runArgs": ["--name", "sage_devcontainer"]
+  "runArgs": [
+    "--name",
+    "sage_devcontainer"
+  ]
 }
\ No newline at end of file