diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8b6b691..5df41ff 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -23,23 +23,6 @@ jobs: df -hT echo "==============================================================================" - - name: 查看变量 - run: | - echo "${{ secrets.ALIYUN_REGISTRY_PASSWORD }}" - echo "${{ secrets.ALIYUN_REGISTRY_USER }}" - echo "${{ secrets.ALIYUN_NAME_SPACE }}" - echo "${{ secrets.ALIYUN_REGISTRY }}" - - - name: Check Secrets Existence - run: | - if [ -z "${{ secrets.ALIYUN_REGISTRY }}" ]; then - echo "::error::ALIYUN_REGISTRY is missing" - exit 1 - else - echo "Secrets are configured" - fi - - - name: Restart docker run: docker -v @@ -58,7 +41,7 @@ jobs: - name: Login to Aliyun Container Registry run: | - echo "qbh5201314" | docker login -u "as94789@qq.com" --password-stdin "registry.cn-hangzhou.aliyuncs.com" + echo "$ALIYUN_REGISTRY_PASSWORD" | docker login -u "$ALIYUN_REGISTRY_USER" --password-stdin "$ALIYUN_REGISTRY" - name: Build and push image Aliyun run: | @@ -120,7 +103,7 @@ jobs: fi image_name_tag="${image_name_tag%%@*}" - new_image="registry.cn-hangzhou.aliyuncs.com/hokori-images/$platform_prefix$name_space_prefix$image_name_tag" + new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$platform_prefix$name_space_prefix$image_name_tag" echo "docker tag $image $new_image" docker tag "$image" "$new_image" echo "docker push $new_image"