From cc803ea764465d9f2682cc44931e839a5816a1bd Mon Sep 17 00:00:00 2001 From: David Shen <2984600+pantherman594@users.noreply.github.com> Date: Tue, 7 Apr 2026 07:58:38 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"Rewrite=20ghcr.io=20in=20devcontainer?= =?UTF-8?q?=20features=20to=20use=20the=20pull=20through=20cach=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6b03be5f19e34fdc9f02ae27dce1f84a30209222. --- startupscript/butane/005-parse-devcontainer.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/startupscript/butane/005-parse-devcontainer.sh b/startupscript/butane/005-parse-devcontainer.sh index cd406ed5..ee15ba06 100755 --- a/startupscript/butane/005-parse-devcontainer.sh +++ b/startupscript/butane/005-parse-devcontainer.sh @@ -78,11 +78,6 @@ if [[ -d "${DEVCONTAINER_FEATURES_PATH}" ]]; then rsync -a --ignore-existing "${DEVCONTAINER_FEATURES_PATH}/" "${DEVCONTAINER_PATH}/.devcontainer/features" fi -# Rewrite ghcr.io references to use the GAR pull-through cache -readonly GHCR_CACHE="us-central1-docker.pkg.dev/workbench-app-cache/ghcr-cache" -sed -i "s|ghcr\.io/|${GHCR_CACHE}/|g" "${DEVCONTAINER_CONFIG_PATH}" -find "${DEVCONTAINER_PATH}/.devcontainer/features" -name devcontainer-feature.json -exec sed -i "s|ghcr\.io/|${GHCR_CACHE}/|g" {} + - replace_template_options() { local TEMPLATE_PATH="$1"