diff --git a/develop-base/.devcontainer/Dockerfile b/develop-base/.devcontainer/Dockerfile index 1ab3774..c4e8d95 100644 --- a/develop-base/.devcontainer/Dockerfile +++ b/develop-base/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM crpi-kbfsbvlqwt19zxum-vpc.cn-hongkong.personal.cr.aliyuncs.com/registry-yqxpro/devcontainers-common-base +FROM registry.yqxpro.com/devcontainers/common-base # Mount for docker-in-docker VOLUME [ "/var/lib/docker" ] diff --git a/develop-base/.devcontainer/devcontainer.json b/develop-base/.devcontainer/devcontainer.json index 2082bd6..00be2f8 100644 --- a/develop-base/.devcontainer/devcontainer.json +++ b/develop-base/.devcontainer/devcontainer.json @@ -5,32 +5,8 @@ }, "features": { "ghcr.io/devcontainers/features/git:1": {}, - "ghcr.io/devcontainers/features/git-lfs:1": { - "version": "latest", - }, - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "version": "latest", - }, - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { - "version": "latest", - }, - }, - "remoteUser": "codespace", - "containerUser": "codespace", - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Set *default* container specific settings.json values on container create. - "settings": { - "lldb.executable": "/usr/bin/lldb", - }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [], - }, + "ghcr.io/devcontainers/features/git-lfs:1": {}, + "ghcr.io/devcontainers/features/docker-in-docker:2": {}, + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}, }, } diff --git a/system-setup.sh b/system-setup.sh index 3c4fc40..7b792a3 100644 --- a/system-setup.sh +++ b/system-setup.sh @@ -1,16 +1,10 @@ #!/bin/bash -export REGISTRY_USERNAME=qxyang686@qq.com -export REGISTRY_PASSWORD= -export REGISTRY_HOST=crpi-kbfsbvlqwt19zxum-vpc.cn-hongkong.personal.cr.aliyuncs.com -export REGISTRY=crpi-kbfsbvlqwt19zxum-vpc.cn-hongkong.personal.cr.aliyuncs.com/registry-yqxpro - 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 -docker login --username=$REGISTRY_USERNAME --password=$REGISTRY_PASSWORD $REGISTRY_HOST docker run -d \ -p 5000:5000 \ diff --git a/universal-base/.devcontaiener/Dockerfile b/universal-base/.devcontaiener/Dockerfile index e703dcd..3efbf3e 100644 --- a/universal-base/.devcontaiener/Dockerfile +++ b/universal-base/.devcontaiener/Dockerfile @@ -1 +1 @@ -FROM crpi-kbfsbvlqwt19zxum-vpc.cn-hongkong.personal.cr.aliyuncs.com/registry-yqxpro/devcontainers-develop-base +FROM registry.yqxpro.com/devcontainers/develop-base diff --git a/universal-base/.devcontaiener/devcontainer.json b/universal-base/.devcontaiener/devcontainer.json index 4735d52..ab11802 100644 --- a/universal-base/.devcontaiener/devcontainer.json +++ b/universal-base/.devcontaiener/devcontainer.json @@ -17,9 +17,7 @@ "useOryxIfAvailable": "false", }, "./local-features/patch-python": {}, - "ghcr.io/devcontainers/features/conda:1": { - "version": "latest", - }, + "ghcr.io/devcontainers/features/conda:1": {}, "./local-features/patch-conda": {}, "ghcr.io/devcontainers/features/java:1": { "jdkDistro": "tem", @@ -28,21 +26,12 @@ "installGradle": "true", "installMaven": "true", }, - "ghcr.io/devcontainers/features/go:1": { - "version": "latest", - }, + "ghcr.io/devcontainers/features/go:1": {}, "ghcr.io/devcontainers/features/rust:1": { - "version": "latest", "profile": "complete", }, "./local-features/setup-user": "latest", }, - "remoteUser": "codespace", - "containerUser": "codespace", - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Configure tool-specific properties. "customizations": { // Configure properties specific to VS Code. @@ -75,10 +64,7 @@ "type": "pythonEnvironment", }, ], - "lldb.executable": "/usr/bin/lldb", }, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [], }, }, }