From 6afc003db19992c1cba5eb677d582617a835180f Mon Sep 17 00:00:00 2001 From: blxdyx <125243069+blxdyx@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:29:18 +0800 Subject: [PATCH] disable docker_tag ci and add latest tag (#549) --- .github/workflows/docker-tags.yml | 18 +++++++++--------- .github/workflows/release.yml | 1 + Makefile | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker-tags.yml index 99ed66f921c..78cfe56c932 100644 --- a/.github/workflows/docker-tags.yml +++ b/.github/workflows/docker-tags.yml @@ -3,7 +3,7 @@ name: Docker tags on: push: tags: - - '*.*.*' + - 'y*.*.*' workflow_dispatch: jobs: @@ -15,16 +15,16 @@ jobs: with: fetch-depth: 0 - - name: dockerhub-login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB }} - password: ${{ secrets.DOCKERHUB_KEY }} +# - name: dockerhub-login +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB }} +# password: ${{ secrets.DOCKERHUB_KEY }} - name: ghcr-login uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.repository_owner }} + username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - uses: docker/setup-qemu-action@v3 @@ -35,5 +35,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${GITHUB_REF#refs/tags/} - DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} +# DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} +# DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 429a1e75194..a90b5662aa3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -129,6 +129,7 @@ jobs: --build-arg VERSION=${{ env.BUILD_VERSION }} \ --build-arg APPLICATION=${{ env.APPLICATION }} \ --tag ${{ env.DOCKER_URL }}:${{ env.BUILD_VERSION }} \ + --tag ${{ env.DOCKER_URL }}:latest \ --target release \ --attest type=provenance,mode=max \ --sbom=true \ diff --git a/Makefile b/Makefile index 1a3a00ffb88..ba7d5e90ec8 100644 --- a/Makefile +++ b/Makefile @@ -288,8 +288,8 @@ release-dry-run: git-submodules --privileged \ -e CGO_ENABLED=1 \ -e GITHUB_TOKEN \ - -e DOCKER_USERNAME \ - -e DOCKER_PASSWORD \ +# -e DOCKER_USERNAME \ +# -e DOCKER_PASSWORD \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \