diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 766fe5a5c..0851874da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,12 +51,6 @@ jobs: - name: Docker setup Buildx uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: gztime - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -69,10 +63,11 @@ jobs: id: meta with: images: | - ghcr.io/${{ github.repository_owner }}/gzctf/gzctf - gztime/gzctf + ghcr.io/${{ github.repository }} + github-token: ${{ secrets.GITHUB_TOKEN }} tags: | latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }} + develop,enable=${{ startsWith(github.ref, 'refs/heads/develop') }} type=ref,event=branch type=semver,pattern={{raw}} type=sha,enable=true,priority=100,prefix=,suffix=,format=short @@ -86,17 +81,17 @@ jobs: platforms: linux/amd64,linux/arm64 push: true - - name: Prune old packages - uses: vlaurin/action-ghcr-prune@v0.5.0 - with: - dry-run: false - token: ${{ secrets.PACKAGE_TOKEN }} - container: "gzctf/gzctf" - keep-tags-regexes: ^v(.)* - prune-tags-regexes: ^[0-9a-f]{6,40} - keep-tags: | - latest - main - develop - keep-last: 20 - prune-untagged: false + # - name: Prune old packages + # uses: vlaurin/action-ghcr-prune@v0.5.0 + # with: + # dry-run: false + # token: ${{ secrets.PACKAGE_TOKEN }} + # container: "gzctf/gzctf" + # keep-tags-regexes: ^v(.)* + # prune-tags-regexes: ^[0-9a-f]{6,40} + # keep-tags: | + # latest + # main + # develop + # keep-last: 20 + # prune-untagged: false