Rephrase release stage to make it prettier.

This commit is contained in:
Greyscale 2024-05-18 21:47:51 +02:00
parent 39514914ad
commit b3feff0288
2 changed files with 19 additions and 25 deletions

View file

@ -17,7 +17,7 @@ env:
jobs: jobs:
cleanup-delete-candidate-image: cleanup-delete-candidate-image:
name: Run Trivy name: Delete candidate image
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: benzine-framework/action-setup-docker@main - uses: benzine-framework/action-setup-docker@main
@ -27,6 +27,7 @@ jobs:
- uses: bots-house/ghcr-delete-image-action@v1.1.0 - uses: bots-house/ghcr-delete-image-action@v1.1.0
with: with:
owner: ${{ github.repository_owner }} owner: ${{ github.repository_owner }}
name: ${{ github.event.repository.name }} #name: ${{ github.event.repository.name }}
name: bouncer
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}
tag: build-${{ github.sha }} tag: build-${{ github.sha }}

View file

@ -14,28 +14,21 @@ env:
RELEASE_IMAGE_DOCKER: benzine/bouncer:latest RELEASE_IMAGE_DOCKER: benzine/bouncer:latest
jobs: jobs:
release: release-ghcr:
name: Release name: Release GHCR
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy:
matrix:
registry:
- ghcr
- docker
fail-fast: false
steps: steps:
- uses: benzine-framework/action-setup-docker@main - run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
with: - run: docker pull ${{ env.CANDIDATE_IMAGE }}
ghcr_user: ${{ github.repository_owner }} - run: docker tag ${{ env.CANDIDATE_IMAGE }} ${{ env.RELEASE_IMAGE_GHCR }}
ghcr_token: ${{ secrets.GHCR_TOKEN }} - run: docker push ${{ env.RELEASE_IMAGE_GHCR }}
docker_hub_user: ${{ secrets.DOCKER_HUB_USER }}
docker_hub_token: ${{ secrets.DOCKER_HUB_TOKEN }} release-docker-hub:
- name: "Pull Candidate Image" name: Release Docker Hub
run: docker pull ${{ env.CANDIDATE_IMAGE }} runs-on: ubuntu-latest
- name: "Login to GHCR" steps:
if: matrix.registry == 'ghcr' - run: docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ secrets.GITHUB_TOKEN }}
run: docker login ghcr.io -u matthewbaggett -p ${{ secrets.GITHUB_TOKEN }} - run: docker login docker.io -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_TOKEN }}
- name: "Tag Candidate Image" - run: docker pull ${{ env.CANDIDATE_IMAGE }}
run: docker tag ${{ env.CANDIDATE_IMAGE }} ${{ matrix.registry == 'ghcr' && env.RELEASE_IMAGE_GHCR || env.RELEASE_IMAGE_DOCKER }} - run: docker tag ${{ env.CANDIDATE_IMAGE }} ${{ env.RELEASE_IMAGE_DOCKER }}
- name: "Push Release Image" - run: docker push ${{ env.RELEASE_IMAGE_DOCKER }}
run: docker push ${{ matrix.registry == 'ghcr' && env.RELEASE_IMAGE_GHCR || env.RELEASE_IMAGE_DOCKER }}