构建脚本准备

build.sh

@@ -5,26 +5,23 @@ export REGISTRY=registry.yqxpro.com
 pushd common-base
 npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
-			--image-name ${REGISTRY}/devcontainers/common-base \
+			--image-name ${REGISTRY}/devcontainers/common-base --push \
 			--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
 
 pushd develop-base
 npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
-			--image-name ${REGISTRY}/devcontainers/develop-base \
+			--image-name ${REGISTRY}/devcontainers/develop-base --push \
 			--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
 
 pushd universal-base
 npx devcontainer build \
 			--platform linux/amd64,linux/arm64 \
-			--image-name ${REGISTRY}/devcontainers/universal-base \
+			--image-name ${REGISTRY}/devcontainers/universal-base --push \
 			--cache-to type=local,dest=${HOME}/docker-buildcache/devcontainers/universal-base,mode=max \
 			--cache-from type=local,src=${HOME}/docker-buildcache/devcontainers/universal-base && \
-		docker push ${REGISTRY}/devcontainers/universal-base &&\
 popd

system-setup.sh

@@ -1,13 +1,11 @@
 #!/bin/bash
 
-export IP=172.22.178.77
-
 sudo apt update
 sudo apt install -y npm git
 curl -fsSL https://raw.githubusercontent.com/docker/docker-install/master/install.sh | sh
 sudo usermod -aG docker $USER
-docker buildx create --use --name multiarch-builder --driver-opt "env.HOST_ALIASES=registry.yqxpro.com:${IP}"
-echo "$IP registry.yqxpro.com" | sudo tee -a /etc/hosts
+docker buildx create --use --bootstrap --name multiarch-builder --driver-opt network=host
+echo "127.0.0.1 registry.yqxpro.com" | sudo tee -a /etc/hosts
 
 tar xvzf certs.tgz
 docker run -d \