diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d7961acc..ec154e3e 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -7,9 +7,9 @@ on: # branches: [ main ] env: - REGISTRY: registry.cn-hangzhou.aliyuncs.com - ALIYUN_REGISTRY_USER: "${{ secrets.ALIYUN_REGISTRY_USER }}" - ALIYUN_REGISTRY_PASSWORD: "${{ secrets.ALIYUN_REGISTRY_PASSWORD }}" + REGISTRY: registry.cn-shanghai.aliyuncs.com + ALIYUN_REGISTRY_USER: "${{ secrets.ALIYUN_REGISTRY_USER2 }}" + ALIYUN_REGISTRY_PASSWORD: "${{ secrets.ALIYUN_REGISTRY_PASSWORD2 }}" MM_NOTIFY_URL: "${{ secrets.MM_NOTIFY_URL }}" jobs: @@ -26,7 +26,7 @@ jobs: - name: Build and push image to ACR EE run: | - docker login -u $ALIYUN_REGISTRY_USER -p $ALIYUN_REGISTRY_PASSWORD $REGISTRY + docker login -u $ALIYUN_REGISTRY_USER2 -p $ALIYUN_REGISTRY_PASSWORD2 $REGISTRY sh pull.sh data=`cat trigger.txt` diff --git a/trigger.txt b/trigger.txt index 24f39667..9966d937 100644 --- a/trigger.txt +++ b/trigger.txt @@ -1 +1,29 @@ -chivalry1314/dify-api:a75970169f19ff106974c4217bb4b3400c650a48 registry.cn-hangzhou.aliyuncs.com/gkzx2024/dify-gkzx-api:202407081133 +gitlab/gitlab-ce:nightly registry.cn-shanghai.aliyuncs.com/xteq_default/gitlab-ce:nightly + +nginx:stable-perl registry.cn-shanghai.aliyuncs.com/xteq_default/nginx:stable-perl + +archlinux:latest registry.cn-shanghai.aliyuncs.com/xteq_default/archlinux:latest + +jenkins/jenkins:latest-jdk17 registry.cn-shanghai.aliyuncs.com/xteq_default/jenkins:latest-jdk17 + +openjdk:8-jdk-alpine3.7 registry.cn-shanghai.aliyuncs.com/xteq_default/openjdk:8-jdk-alpine3.7 + +openjdk:17.0-jdk registry.cn-shanghai.aliyuncs.com/xteq_default/openjdk:17.0-jdk + +dockurr/windows:latest registry.cn-shanghai.aliyuncs.com/xteq_default/windows:latest + +qemux/qemu-docker:latest registry.cn-shanghai.aliyuncs.com/xteq_default/qemu-docker:latest + +dockurr/macos:latest registry.cn-shanghai.aliyuncs.com/xteq_default/macos:latest + +dockurr/samba:latest registry.cn-shanghai.aliyuncs.com/xteq_default/samba:latest + +prom/prometheus:latest registry.cn-shanghai.aliyuncs.com/xteq_default/prometheus:latest + +grafana/grafana:latest registry.cn-shanghai.aliyuncs.com/xteq_default/grafana:latest + +serversideup/docker-ssh:latest registry.cn-shanghai.aliyuncs.com/xteq_default/docker-ssh:latest + +qemux/qemu-arm:latest registry.cn-shanghai.aliyuncs.com/xteq_default/qemu-arm:latest + +qemux/qemu-docker:latest registry.cn-shanghai.aliyuncs.com/xteq_default/qemu-docker:latest diff --git a/trigger_bak.txt b/trigger_bak.txt new file mode 100644 index 00000000..952804e9 --- /dev/null +++ b/trigger_bak.txt @@ -0,0 +1,17 @@ +langgenius/dify-api:0.6.11 registry.cn-zhangjiakou.aliyuncs.com/egt-boot/dify-api:0.6.11 + +langgenius/dify-web:0.6.11 registry.cn-zhangjiakou.aliyuncs.com/egt-boot/dify-web:0.6.11 + +postgres:15-alpine registry.cn-zhangjiakou.aliyuncs.com/egt-boot/postgres:15-alpine + +redis:6-alpine registry.cn-zhangjiakou.aliyuncs.com/egt-boot/redis:6-alpine + +semitechnologies/weaviate:1.19.0 registry.cn-zhangjiakou.aliyuncs.com/egt-boot/weaviate:1.19.0 + +langgenius/dify-sandbox:0.2.1 registry.cn-zhangjiakou.aliyuncs.com/egt-boot/dify-sandbox:0.2.1 + +ubuntu/squid:latest registry.cn-zhangjiakou.aliyuncs.com/egt-boot/squid:latest + +nginx:latest registry.cn-zhangjiakou.aliyuncs.com/egt-boot/nginx:latest + +jenkins/jenkins:jdk17 registry.cn-zhangjiakou.aliyuncs.com/egt-boot/jenkins:jdk17