From fee6cf29ebc1df963adaa193978833d4724b6470 Mon Sep 17 00:00:00 2001 From: Noxcis Date: Sat, 24 Aug 2024 02:26:30 -0500 Subject: [PATCH] Update main.yml --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 61fa9b9..c02f57e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,11 @@ on: description: 'Trigger a manual build and push' default: 'true' +env: + REGISTRY: docker.io + IMAGE_NAME: ${{ github.repository }} + SHA: ${{ github.event.pull_request.head.sha || github.event.after }} + jobs: build-and-analyze: runs-on: ubuntu-latest @@ -23,15 +28,33 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v3 with: + registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v4.4.0 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + labels: | + org.opencontainers.image.revision=${{ env.SHA }} + tags: | + type=edge,branch=$repo.default_branch + type=semver,pattern=v{{version}} + type=sha,prefix=,suffix=,format=short - - name: Build multiarch Docker image - id: build-image - run: | - docker buildx create --use - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t wg-dashboard:latest . - + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@v4.0.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + - name: Docker Scout Analysis id: docker-scout run: |