This commit is contained in:
2026-02-14 20:07:18 +08:00
parent bc660d97a5
commit b8a6822ef5
5 changed files with 10 additions and 12 deletions

View File

@@ -6,8 +6,8 @@ pushd common-base
npx devcontainer build \ npx devcontainer build \
--platform linux/amd64,linux/arm64 \ --platform linux/amd64,linux/arm64 \
--image-name ${REGISTRY}/devcontainers/common-base \ --image-name ${REGISTRY}/devcontainers/common-base \
--cache-to type=local,dest=${HOME}/docker-buildcache/devcontainers/common-base,mode=max \ --cache-to type=registry,ref=${REGISTRY}/devcontainers/common-base:buildcache,mode=max \
--cache-from type=local,src=${HOME}/docker-buildcache/devcontainers/common-base && \ --cache-from type=registry,ref=${REGISTRY}/devcontainers/common-base:buildcache && \
docker push ${REGISTRY}/devcontainers/common-base &&\ docker push ${REGISTRY}/devcontainers/common-base &&\
popd popd
@@ -15,8 +15,8 @@ pushd develop-base
npx devcontainer build \ npx devcontainer build \
--platform linux/amd64,linux/arm64 \ --platform linux/amd64,linux/arm64 \
--image-name ${REGISTRY}/devcontainers/develop-base \ --image-name ${REGISTRY}/devcontainers/develop-base \
--cache-to type=local,dest=${HOME}/docker-buildcache/devcontainers/develop-base,mode=max \ --cache-to type=local,ref=${REGISTRY}/devcontainers/develop-base,mode=max \
--cache-from type=local,src=${HOME}/docker-buildcache/devcontainers/develop-base && \ --cache-from type=local,ref=${REGISTRY}/devcontainers/develop-base && \
docker push ${REGISTRY}/devcontainers/develop-base &&\ docker push ${REGISTRY}/devcontainers/develop-base &&\
popd popd

View File

@@ -17,7 +17,7 @@
"useOryxIfAvailable": "false", "useOryxIfAvailable": "false",
}, },
"./local-features/patch-python": {}, "./local-features/patch-python": {},
"ghcr.io/devcontainers/features/conda:1": {}, "ghcr.io/devcontainers/features/anaconda:1": {},
"./local-features/patch-conda": {}, "./local-features/patch-conda": {},
"ghcr.io/devcontainers/features/java:1": { "ghcr.io/devcontainers/features/java:1": {
"jdkDistro": "tem", "jdkDistro": "tem",

View File

@@ -1,7 +1,5 @@
{ {
"id": "patch-conda", "id": "patch-conda",
"name": "Patch Conda Packages", "name": "Patch Conda Packages",
"installsAfter": [ "installsAfter": ["ghcr.io/devcontainers/features/anaconda"]
"ghcr.io/devcontainers/features/conda"
]
} }

View File

@@ -43,4 +43,4 @@ sudo_if /usr/local/python/3.11.*/bin/python -m pip install --upgrade pip
# https://github.com/advisories/GHSA-5rjg-fvgr-3xxf # https://github.com/advisories/GHSA-5rjg-fvgr-3xxf
# Updating setuptools version for python 3.11. Must be removed when pinned version 3.11 is updated to a different python version. # Updating setuptools version for python 3.11. Must be removed when pinned version 3.11 is updated to a different python version.
update_package /usr/local/python/3.11.*/bin/python setuptools "78.1.1" update_package /usr/local/python/3.11.*/bin/python setuptools "78.1.1"

View File

@@ -22,7 +22,7 @@
"./local-features/nvs", "./local-features/nvs",
"ghcr.io/devcontainers/features/python:1", "ghcr.io/devcontainers/features/python:1",
"./local-features/patch-python", "./local-features/patch-python",
"ghcr.io/devcontainers/features/conda:1", "ghcr.io/devcontainers/features/anaconda:1",
"./local-features/patch-conda", "./local-features/patch-conda",
"ghcr.io/devcontainers/features/java:1", "ghcr.io/devcontainers/features/java:1",
"ghcr.io/devcontainers/features/go:1", "ghcr.io/devcontainers/features/go:1",