diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index a03d40096..4e8bf34e7 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -68,6 +68,8 @@ jobs: registry: git.viaeon.com username: ${{ github.actor }} password: ${{ secrets.CI_TOKEN }} + env: + DOCKER_BUILDKIT: 0 - name: Build and push Docker image uses: docker/build-push-action@v5 diff --git a/.github/workflows/docker-guacd.yml b/.github/workflows/docker-guacd.yml index 16a27384c..caaf69e8c 100644 --- a/.github/workflows/docker-guacd.yml +++ b/.github/workflows/docker-guacd.yml @@ -2,6 +2,12 @@ name: Docker guacd Build on: workflow_dispatch: + push: + branches: + - main + - master + paths: + - 'guacd/**' jobs: DOCKERHUB_Guacd_Build: @@ -14,17 +20,12 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Docker Setup Buildx uses: docker/setup-buildx-action@v3 - - name: Docker Login + - name: Docker Login to Harbor uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: Docker Aliyun Login - uses: docker/login-action@v3 - with: - registry: registry.cn-beijing.aliyuncs.com - username: ${{ secrets.ALI_USERNAME }} - password: ${{ secrets.ALI_PASSWORD }} + registry: harbor.viaeon.com + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_PASSWORD }} - name: Build and push Docker images uses: docker/build-push-action@v6 @@ -34,9 +35,7 @@ jobs: file: guacd/Dockerfile push: true tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0 - ${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest - registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0 - registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest - cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache - cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache,mode=max + harbor.viaeon.com/terminal/guacd:1.4.0 + harbor.viaeon.com/terminal/guacd:latest + cache-from: type=registry,ref=harbor.viaeon.com/terminal/guacd:cache + cache-to: type=registry,ref=harbor.viaeon.com/terminal/guacd:cache,mode=max