From 73776a427735da205adb07e99108b3c07d7d7c40 Mon Sep 17 00:00:00 2001 From: Michal Weinert Date: Tue, 9 Apr 2024 12:05:07 +0200 Subject: [PATCH] ops: CI/CD tweaks; added ghcr --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 91c709c..e07bdd3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,10 @@ jobs: uses: actions/checkout@v3 - name: Prepare docker buildx uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - run: echo "${{ secrets.DOCKER_HUB_PASS }}" | docker login -u ${{ secrets.DOCKER_HUB_USER }} --password-stdin + - name: Login to Docker Hub + run: | + echo "${{ secrets.DOCKER_HUB_PASS }}" | docker login -u ${{ secrets.DOCKER_HUB_USER }} --password-stdin + echo "${{ secrets.GITHUB_TOKEN }}" | docker login -u ${{ github.actor }} --password-stdin ghcr.io - name: Build Docker image uses: docker/build-push-action@v3 with: @@ -24,7 +26,7 @@ jobs: push: true cache-from: type=gha cache-to: type=gha,mode=max - tags: tivix/docker-nginx:${{ github.sha }}, tivix/docker-nginx:${{ env.CI_REF_NAME }} + tags: tivix/docker-nginx:${{ github.sha }}, tivix/docker-nginx:${{ env.CI_REF_NAME }}, ghcr.io/tivix/docker-nginx:${{ env.CI_REF_NAME }} - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@master with: