From da8fc382165cf3119ba66b31e83871758309d8eb Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Sat, 11 Oct 2025 10:57:27 +0000 Subject: [PATCH 01/10] chore: Update devcontainer configuration and post-create script for improved SSL certificate handling --- .devcontainer/devcontainer.json | 5 ++++- scripts/devcontainer/Dockerfile | 7 +++++++ scripts/devcontainer/postcreatecommand.sh | 21 ++++++++++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0104e4dc2..89b09fd7a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -76,11 +76,14 @@ "moby": true, "version": "latest" }, + "ghcr.io/devcontainers/features/go:1": { + "version": "latest" + }, "ghcr.io/devcontainers/features/ruby:1": {} }, "mounts": [ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" ], "name": "Devcontainer", - "postCreateCommand": "scripts/devcontainer/postcreatecommand.sh" + "postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh" } diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index 57129de57..4c2c850ec 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -9,6 +9,13 @@ RUN update-ca-certificates # Concatenate all certs for use in EnvVars RUN find /usr/local/share/ca-certificates -type f \( -name '*.pem' -o -name '*.crt' \) -exec cat {} + > "/usr/local/share/ca-certificates/combined-cacerts.pem" +# Set environment variables at the Docker image level so they're available during feature installation +ENV NODE_EXTRA_CA_CERTS="/usr/local/share/ca-certificates/combined-cacerts.pem" +ENV SSL_CERT_FILE="/usr/local/share/ca-certificates/combined-cacerts.pem" +ENV REQUESTS_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem" +ENV CURL_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem" +ENV GIT_SSL_CAINFO="/usr/local/share/ca-certificates/combined-cacerts.pem" + # Ensure CA Certs is available for all shells, Node, Python & Ruby USER vscode RUN echo 'NODE_EXTRA_CA_CERTS="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc diff --git a/scripts/devcontainer/postcreatecommand.sh b/scripts/devcontainer/postcreatecommand.sh index 986a1d5b5..ea794fa29 100755 --- a/scripts/devcontainer/postcreatecommand.sh +++ b/scripts/devcontainer/postcreatecommand.sh @@ -1,18 +1,25 @@ -#!/bin/bash - -rm -Rf ~/.asdf -git clone https://github.com/asdf-vm/asdf.git ~/.asdf; -chmod +x ~/.asdf/asdf.sh; -echo '. $HOME/.asdf/asdf.sh' >> ~/.zshrc +#!/bin/zsh echo 'export GPG_TTY=$TTY' | cat - ~/.zshrc > temp && mv temp ~/.zshrc +echo 'export PATH="$HOME/go/bin:/usr/local/go/bin:$PATH"' >> ~/.zshrc +echo 'export PATH="$HOME/.asdf/shims:$PATH"' >> ~/.zshrc +echo 'eval "$(asdf completion zsh)"' >> ~/.zshrc source ~/.zshrc -echo 'asdf setup complete' +# Create pip config for SSL certificates before make config runs +mkdir -p ~/.config/pip +cat > ~/.config/pip/pip.conf << EOF +[global] +cert = /usr/local/share/ca-certificates/combined-cacerts.pem +trusted-host = pypi.org + files.pythonhosted.org + pypi.python.org +EOF make config +gem install jekyll bundler jekyll --version && cd docs && bundle install echo 'jekyll setup complete' From 29b9b48c708649dd0145fc017fa84704768c64d3 Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Sat, 11 Oct 2025 11:19:28 +0000 Subject: [PATCH 02/10] chore: Update SSL certificate paths in Dockerfile and post-create script to use combined global + custom certs --- scripts/devcontainer/Dockerfile | 25 ++++++++++------------- scripts/devcontainer/postcreatecommand.sh | 8 ++++---- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index 4c2c850ec..5ea184d2d 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -6,20 +6,17 @@ RUN apt-get update && apt-get install -y ca-certificates COPY custom-ca-certs/. /usr/local/share/ca-certificates/ RUN update-ca-certificates -# Concatenate all certs for use in EnvVars -RUN find /usr/local/share/ca-certificates -type f \( -name '*.pem' -o -name '*.crt' \) -exec cat {} + > "/usr/local/share/ca-certificates/combined-cacerts.pem" - -# Set environment variables at the Docker image level so they're available during feature installation -ENV NODE_EXTRA_CA_CERTS="/usr/local/share/ca-certificates/combined-cacerts.pem" -ENV SSL_CERT_FILE="/usr/local/share/ca-certificates/combined-cacerts.pem" -ENV REQUESTS_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem" -ENV CURL_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem" -ENV GIT_SSL_CAINFO="/usr/local/share/ca-certificates/combined-cacerts.pem" +# Use the updated system CA bundle which now includes both system and custom CAs +ENV NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt" +ENV SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" +ENV REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" +ENV CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" +ENV GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt" # Ensure CA Certs is available for all shells, Node, Python & Ruby USER vscode -RUN echo 'NODE_EXTRA_CA_CERTS="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc -RUN echo 'SSL_CERT_FILE="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc -RUN echo 'REQUESTS_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc -RUN echo 'CURL_CA_BUNDLE="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc -RUN echo 'GIT_SSL_CAINFO="/usr/local/share/ca-certificates/combined-cacerts.pem"' >> ~/.zshrc +RUN echo 'NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +RUN echo 'SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +RUN echo 'REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +RUN echo 'CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +RUN echo 'GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc diff --git a/scripts/devcontainer/postcreatecommand.sh b/scripts/devcontainer/postcreatecommand.sh index ea794fa29..ecc072534 100755 --- a/scripts/devcontainer/postcreatecommand.sh +++ b/scripts/devcontainer/postcreatecommand.sh @@ -5,16 +5,16 @@ echo 'export GPG_TTY=$TTY' | cat - ~/.zshrc > temp && mv temp ~/.zshrc echo 'export PATH="$HOME/go/bin:/usr/local/go/bin:$PATH"' >> ~/.zshrc echo 'export PATH="$HOME/.asdf/shims:$PATH"' >> ~/.zshrc echo 'eval "$(asdf completion zsh)"' >> ~/.zshrc +echo 'export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +echo 'export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc +echo 'export CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc source ~/.zshrc # Create pip config for SSL certificates before make config runs mkdir -p ~/.config/pip cat > ~/.config/pip/pip.conf << EOF [global] -cert = /usr/local/share/ca-certificates/combined-cacerts.pem -trusted-host = pypi.org - files.pythonhosted.org - pypi.python.org +cert = /etc/ssl/certs/ca-certificates.crt EOF make config From 4cfbf54d5faebf619a4f8b3a582208181496ba33 Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Sat, 11 Oct 2025 12:32:30 +0000 Subject: [PATCH 03/10] chore: Enhance devcontainer setup with improved Zsh configuration and additional dependencies --- .devcontainer/devcontainer.json | 6 +---- scripts/devcontainer/Dockerfile | 28 +++++++++++++++++++++-- scripts/devcontainer/postcreatecommand.sh | 18 +++++++-------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 89b09fd7a..0246a4537 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -75,11 +75,7 @@ "installDockerComposeSwitch": true, "moby": true, "version": "latest" - }, - "ghcr.io/devcontainers/features/go:1": { - "version": "latest" - }, - "ghcr.io/devcontainers/features/ruby:1": {} + } }, "mounts": [ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index 5ea184d2d..fda35cc92 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -1,8 +1,23 @@ # syntax=docker/dockerfile:1 FROM mcr.microsoft.com/devcontainers/base:ubuntu -# Copy CA certs and Dynamically set NODE_EXTRA_CA_CERTS accordingly -RUN apt-get update && apt-get install -y ca-certificates +# Copy CA certs and install Ruby and Go via Ubuntu packages (much faster than building from source) +# Also install development libraries needed for Python compilation via asdf +RUN apt-get update && apt-get install -y \ + ca-certificates \ + ruby-full \ + ruby-dev \ + build-essential \ + golang-go \ + libsqlite3-dev \ + libbz2-dev \ + libncurses-dev \ + libffi-dev \ + libreadline-dev \ + liblzma-dev \ + libssl-dev \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* COPY custom-ca-certs/. /usr/local/share/ca-certificates/ RUN update-ca-certificates @@ -13,10 +28,19 @@ ENV REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" ENV CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" ENV GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt" +# Set Go environment variables +ENV GOPATH="/home/vscode/go" +ENV PATH="/go/bin:${GOPATH}/bin:${PATH}" + # Ensure CA Certs is available for all shells, Node, Python & Ruby USER vscode + RUN echo 'NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc + +# Add Go environment to shell +RUN echo 'export GOPATH="/home/vscode/go"' >> ~/.zshrc +RUN echo 'export PATH="/go/bin:$GOPATH/bin:$PATH"' >> ~/.zshrc diff --git a/scripts/devcontainer/postcreatecommand.sh b/scripts/devcontainer/postcreatecommand.sh index ecc072534..c0d0a6a9c 100755 --- a/scripts/devcontainer/postcreatecommand.sh +++ b/scripts/devcontainer/postcreatecommand.sh @@ -5,21 +5,19 @@ echo 'export GPG_TTY=$TTY' | cat - ~/.zshrc > temp && mv temp ~/.zshrc echo 'export PATH="$HOME/go/bin:/usr/local/go/bin:$PATH"' >> ~/.zshrc echo 'export PATH="$HOME/.asdf/shims:$PATH"' >> ~/.zshrc echo 'eval "$(asdf completion zsh)"' >> ~/.zshrc -echo 'export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc -echo 'export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc -echo 'export CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc source ~/.zshrc -# Create pip config for SSL certificates before make config runs -mkdir -p ~/.config/pip -cat > ~/.config/pip/pip.conf << EOF -[global] -cert = /etc/ssl/certs/ca-certificates.crt -EOF +# # Create pip config for SSL certificates before make config runs +# mkdir -p ~/.config/pip +# cat > ~/.config/pip/pip.conf << EOF +# [global] +# cert = /etc/ssl/certs/ca-certificates.crt +# EOF +make _install-dependencies # required before config to ensure python is available due to race between config:: make targets make config -gem install jekyll bundler +sudo gem install jekyll bundler jekyll --version && cd docs && bundle install echo 'jekyll setup complete' From e3df2c3839e8f185e2131463cc584f36155111cb Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Sat, 11 Oct 2025 13:27:35 +0000 Subject: [PATCH 04/10] chore: Enhance devcontainer setup with improved Zsh configuration and additional dependencies --- .vscode/settings.json | 4 +++- scripts/devcontainer/postcreatecommand.sh | 7 ------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f0b23acc3..ae9b5ecf2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,8 +8,10 @@ "**/.svn": true, "**/CVS": true, "**/Thumbs.db": true, - //".devcontainer": true, ".github": false, ".vscode": false }, + "terminal.integrated.env.linux": { + "PATH": "/home/vscode/.asdf/shims:/home/vscode/.asdf/bin:${env:PATH}" + } } diff --git a/scripts/devcontainer/postcreatecommand.sh b/scripts/devcontainer/postcreatecommand.sh index c0d0a6a9c..a70930f0d 100755 --- a/scripts/devcontainer/postcreatecommand.sh +++ b/scripts/devcontainer/postcreatecommand.sh @@ -7,13 +7,6 @@ echo 'export PATH="$HOME/.asdf/shims:$PATH"' >> ~/.zshrc echo 'eval "$(asdf completion zsh)"' >> ~/.zshrc source ~/.zshrc -# # Create pip config for SSL certificates before make config runs -# mkdir -p ~/.config/pip -# cat > ~/.config/pip/pip.conf << EOF -# [global] -# cert = /etc/ssl/certs/ca-certificates.crt -# EOF - make _install-dependencies # required before config to ensure python is available due to race between config:: make targets make config From 100544af6dddac588057f4c67970353ddc49e51c Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 09:36:06 +0100 Subject: [PATCH 05/10] chore: Add asdf shims to devcontainer path --- .devcontainer/devcontainer.json | 5 ++++- scripts/devcontainer/Dockerfile | 4 ++-- scripts/devcontainer/postcreatecommand.sh | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0246a4537..bb6011e2f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -81,5 +81,8 @@ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" ], "name": "Devcontainer", - "postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh" + "postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh", + "remoteEnv": { + "PATH": "/home/vscode/.asdf/shims:/home/vscode/.asdf/bin:${PATH}" + } } diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index fda35cc92..35e7d9a64 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -42,5 +42,5 @@ RUN echo 'CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc # Add Go environment to shell -RUN echo 'export GOPATH="/home/vscode/go"' >> ~/.zshrc -RUN echo 'export PATH="/go/bin:$GOPATH/bin:$PATH"' >> ~/.zshrc +RUN echo 'GOPATH="/home/vscode/go"' >> ~/.zshrc +RUN echo 'PATH="/home/vscode/.asdf/shims:/go/bin:$GOPATH/bin:$PATH"' >> ~/.zshrc diff --git a/scripts/devcontainer/postcreatecommand.sh b/scripts/devcontainer/postcreatecommand.sh index a70930f0d..39c334c8b 100755 --- a/scripts/devcontainer/postcreatecommand.sh +++ b/scripts/devcontainer/postcreatecommand.sh @@ -2,8 +2,6 @@ echo 'export GPG_TTY=$TTY' | cat - ~/.zshrc > temp && mv temp ~/.zshrc -echo 'export PATH="$HOME/go/bin:/usr/local/go/bin:$PATH"' >> ~/.zshrc -echo 'export PATH="$HOME/.asdf/shims:$PATH"' >> ~/.zshrc echo 'eval "$(asdf completion zsh)"' >> ~/.zshrc source ~/.zshrc From c37a0ea390a39798d3c2974c262bd126b9b9b8a2 Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 09:02:02 +0000 Subject: [PATCH 06/10] chore: Update devcontainer configuration to streamline post-create command and refine PATH settings --- .devcontainer/devcontainer.json | 4 ++-- scripts/devcontainer/Dockerfile | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bb6011e2f..2f3d85329 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -81,8 +81,8 @@ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" ], "name": "Devcontainer", - "postCreateCommand": "zsh scripts/devcontainer/postcreatecommand.sh", + "postCreateCommand": "scripts/devcontainer/postcreatecommand.sh", "remoteEnv": { - "PATH": "/home/vscode/.asdf/shims:/home/vscode/.asdf/bin:${PATH}" + "PATH": "/home/vscode/.asdf/shims:/go/bin:/home/vscode/go/bin:/home/vscode/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/vscode/.vscode-server/data/User/globalStorage/github.copilot-chat/debugCommand:/home/vscode/.local/bin" } } diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index 35e7d9a64..4484ebc1b 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -43,4 +43,3 @@ RUN echo 'GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc # Add Go environment to shell RUN echo 'GOPATH="/home/vscode/go"' >> ~/.zshrc -RUN echo 'PATH="/home/vscode/.asdf/shims:/go/bin:$GOPATH/bin:$PATH"' >> ~/.zshrc From 1fbbecb737d2ae004b44b0048bdbfe55b285fb1e Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 09:17:59 +0000 Subject: [PATCH 07/10] Remove redundant path config --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ae9b5ecf2..d7c02400c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,8 +10,5 @@ "**/Thumbs.db": true, ".github": false, ".vscode": false - }, - "terminal.integrated.env.linux": { - "PATH": "/home/vscode/.asdf/shims:/home/vscode/.asdf/bin:${env:PATH}" } } From 7e04a89d863d447218951bcc56294b826f18e883 Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 09:41:34 +0000 Subject: [PATCH 08/10] chore: Refine devcontainer configuration by removing redundant remoteEnv and updating PATH in Dockerfile --- .devcontainer/devcontainer.json | 5 +---- scripts/devcontainer/Dockerfile | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2f3d85329..acad29809 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -81,8 +81,5 @@ "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" ], "name": "Devcontainer", - "postCreateCommand": "scripts/devcontainer/postcreatecommand.sh", - "remoteEnv": { - "PATH": "/home/vscode/.asdf/shims:/go/bin:/home/vscode/go/bin:/home/vscode/.asdf/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/vscode/.vscode-server/data/User/globalStorage/github.copilot-chat/debugCommand:/home/vscode/.local/bin" - } + "postCreateCommand": "scripts/devcontainer/postcreatecommand.sh" } diff --git a/scripts/devcontainer/Dockerfile b/scripts/devcontainer/Dockerfile index 4484ebc1b..990163b6f 100644 --- a/scripts/devcontainer/Dockerfile +++ b/scripts/devcontainer/Dockerfile @@ -28,9 +28,9 @@ ENV REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" ENV CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" ENV GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt" -# Set Go environment variables +# Set Go environment variables and prepend asdf shims/bin to PATH ENV GOPATH="/home/vscode/go" -ENV PATH="/go/bin:${GOPATH}/bin:${PATH}" +ENV PATH="/home/vscode/.asdf/shims:/home/vscode/.asdf/bin:/go/bin:${GOPATH}/bin:${PATH}" # Ensure CA Certs is available for all shells, Node, Python & Ruby USER vscode @@ -40,6 +40,3 @@ RUN echo 'SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc RUN echo 'GIT_SSL_CAINFO="/etc/ssl/certs/ca-certificates.crt"' >> ~/.zshrc - -# Add Go environment to shell -RUN echo 'GOPATH="/home/vscode/go"' >> ~/.zshrc From 1014713f6dedb77bbb6160908eeacb68f22b833a Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 12:06:41 +0000 Subject: [PATCH 09/10] chore: Add AWS CLI feature and update mounts for AWS configuration --- .devcontainer/devcontainer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index acad29809..7e90f63d9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -63,6 +63,7 @@ "omzPlugins": "https://github.com/zsh-users/zsh-autosuggestions.git https://github.com/zsh-users/zsh-syntax-highlighting.git", "plugins": "zsh-autosuggestions zsh-syntax-highlighting" }, + "ghcr.io/devcontainers/features/aws-cli:1": {}, "ghcr.io/devcontainers/features/common-utils": { "configureZshAsDefaultShell": true, "installOhMyZsh": true, @@ -78,7 +79,8 @@ } }, "mounts": [ - "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" + "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached", + "source=${localEnv:HOME}/.aws,target=/home/vscode/.aws,type=bind,consistency=cached" ], "name": "Devcontainer", "postCreateCommand": "scripts/devcontainer/postcreatecommand.sh" From a098fa8868d617c066cb33e9b1128e4617e58330 Mon Sep 17 00:00:00 2001 From: Mike Houston Date: Mon, 13 Oct 2025 12:36:00 +0000 Subject: [PATCH 10/10] Downgrade Python version to 3.12.11 in .tool-versions to work with proxygen --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 8fd353861..7141c23f8 100644 --- a/.tool-versions +++ b/.tool-versions @@ -3,7 +3,7 @@ gitleaks 8.24.0 jq 1.6 nodejs 22.15.0 pre-commit 3.6.0 -python 3.13.2 +python 3.12.11 terraform 1.10.1 terraform-docs 0.19.0 trivy 0.61.0