Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
tschaffter committed Aug 28, 2024
1 parent 940a8aa commit cfb7e2f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 14 deletions.
14 changes: 8 additions & 6 deletions tools/devcontainers/sage/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG imageVersion=jammy-20240227
ARG imageVersion=jammy-20240808
FROM ubuntu:$imageVersion

# Safer bash scripts with 'set -euxo pipefail'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 11 additions & 8 deletions tools/devcontainers/sage/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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"
]
}

0 comments on commit cfb7e2f

Please sign in to comment.