diff --git a/deploy/portainer/docker-compose.yml b/deploy/portainer/docker-compose.yml index 384cd4d5..5a72a123 100644 --- a/deploy/portainer/docker-compose.yml +++ b/deploy/portainer/docker-compose.yml @@ -22,7 +22,7 @@ x-common-env: &common-env services: gb32960-ingest-app: - image: harbor.lnh2e.com/lingniu-v1/gb32960-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} + image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/gb32960-ingest-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} container_name: gb32960-ingest-app restart: unless-stopped environment: @@ -46,7 +46,7 @@ services: - vehicle-ingest vehicle-history-app: - image: harbor.lnh2e.com/lingniu-v1/vehicle-history-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} + image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-history-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} container_name: vehicle-history-app restart: unless-stopped depends_on: @@ -70,7 +70,7 @@ services: - vehicle-ingest vehicle-analytics-app: - image: harbor.lnh2e.com/lingniu-v1/vehicle-analytics-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} + image: crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/vehicle-analytics-app:${LINGNIU_IMAGE_VERSION:?set LINGNIU_IMAGE_VERSION} container_name: vehicle-analytics-app restart: unless-stopped depends_on: diff --git a/woodpecker.yml b/woodpecker.yml index 47c1d415..812ab27c 100644 --- a/woodpecker.yml +++ b/woodpecker.yml @@ -37,27 +37,26 @@ steps: - main volumes: - /var/run/docker.sock:/var/run/docker.sock + environment: + ALIYUN_ACR_USERNAME: + from_secret: aliyun_acr_username + ALIYUN_ACR_PASSWORD: + from_secret: aliyun_acr_password commands: | cd $CI_WORKSPACE APP_NAME=gb32960-ingest-app APP_VERSION=$(cat $CI_WORKSPACE/project_version.txt) - IMAGE=harbor.lnh2e.com/lingniu-v1/$APP_NAME:$APP_VERSION + IMAGE=crpi-85r4m0ackrm3qpje.cn-shanghai.personal.cr.aliyuncs.com/oneos/$APP_NAME:$APP_VERSION docker build \ --build-arg APP_NAME=$APP_NAME \ --build-arg APP_VERSION=$APP_VERSION \ -t $IMAGE . - mkdir -p /root/.docker - cat > /root/.docker/config.json < /root/.docker/config.json < /root/.docker/config.json <