From b8a6822ef5acc67d3f019a0112d4ae707c236e36 Mon Sep 17 00:00:00 2001
From: QXYang686 <me@yqxpro.com>
Date: Sat, 14 Feb 2026 20:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                                                  | 8 ++++----
 universal-base/.devcontainer/devcontainer.json            | 2 +-
 .../local-features/patch-conda/devcontainer-feature.json  | 8 +++-----
 .../.devcontainer/local-features/patch-python/install.sh  | 2 +-
 .../local-features/setup-user/devcontainer-feature.json   | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build.sh b/build.sh
index 67a8975..f11af09 100644
--- a/build.sh
+++ b/build.sh
@@ -6,8 +6,8 @@ pushd common-base
 npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
 			--image-name ${REGISTRY}/devcontainers/common-base \
-			--cache-to type=local,dest=${HOME}/docker-buildcache/devcontainers/common-base,mode=max \
-			--cache-from type=local,src=${HOME}/docker-buildcache/devcontainers/common-base && \
+			--cache-to type=registry,ref=${REGISTRY}/devcontainers/common-base:buildcache,mode=max \
+			--cache-from type=registry,ref=${REGISTRY}/devcontainers/common-base:buildcache && \
 		docker push ${REGISTRY}/devcontainers/common-base &&\
 popd
 
@@ -15,8 +15,8 @@ pushd develop-base
 npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
 			--image-name ${REGISTRY}/devcontainers/develop-base \
-			--cache-to type=local,dest=${HOME}/docker-buildcache/devcontainers/develop-base,mode=max \
-			--cache-from type=local,src=${HOME}/docker-buildcache/devcontainers/develop-base && \
+			--cache-to type=local,ref=${REGISTRY}/devcontainers/develop-base,mode=max \
+			--cache-from type=local,ref=${REGISTRY}/devcontainers/develop-base && \
 		docker push ${REGISTRY}/devcontainers/develop-base &&\
 popd
 
diff --git a/universal-base/.devcontainer/devcontainer.json b/universal-base/.devcontainer/devcontainer.json
index ab11802..7206543 100644
--- a/universal-base/.devcontainer/devcontainer.json
+++ b/universal-base/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
       "useOryxIfAvailable": "false",
     },
     "./local-features/patch-python": {},
-    "ghcr.io/devcontainers/features/conda:1": {},
+    "ghcr.io/devcontainers/features/anaconda:1": {},
     "./local-features/patch-conda": {},
     "ghcr.io/devcontainers/features/java:1": {
       "jdkDistro": "tem",
diff --git a/universal-base/.devcontainer/local-features/patch-conda/devcontainer-feature.json b/universal-base/.devcontainer/local-features/patch-conda/devcontainer-feature.json
index 485a071..ad4a3c3 100644
--- a/universal-base/.devcontainer/local-features/patch-conda/devcontainer-feature.json
+++ b/universal-base/.devcontainer/local-features/patch-conda/devcontainer-feature.json
@@ -1,7 +1,5 @@
 {
-    "id": "patch-conda",
-    "name": "Patch Conda Packages",
-	"installsAfter": [
-		"ghcr.io/devcontainers/features/conda"
-	]
+  "id": "patch-conda",
+  "name": "Patch Conda Packages",
+  "installsAfter": ["ghcr.io/devcontainers/features/anaconda"]
 }
diff --git a/universal-base/.devcontainer/local-features/patch-python/install.sh b/universal-base/.devcontainer/local-features/patch-python/install.sh
index 69c7a5a..6ceb81a 100644
--- a/universal-base/.devcontainer/local-features/patch-python/install.sh
+++ b/universal-base/.devcontainer/local-features/patch-python/install.sh
@@ -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
 # 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"
\ No newline at end of file
+update_package /usr/local/python/3.11.*/bin/python setuptools "78.1.1"
diff --git a/universal-base/.devcontainer/local-features/setup-user/devcontainer-feature.json b/universal-base/.devcontainer/local-features/setup-user/devcontainer-feature.json
index 102167b..6a3d982 100644
--- a/universal-base/.devcontainer/local-features/setup-user/devcontainer-feature.json
+++ b/universal-base/.devcontainer/local-features/setup-user/devcontainer-feature.json
@@ -22,7 +22,7 @@
     "./local-features/nvs",
     "ghcr.io/devcontainers/features/python:1",
     "./local-features/patch-python",
-    "ghcr.io/devcontainers/features/conda:1",
+    "ghcr.io/devcontainers/features/anaconda:1",
     "./local-features/patch-conda",
     "ghcr.io/devcontainers/features/java:1",
     "ghcr.io/devcontainers/features/go:1",