From f57440c5be6f2d3034fce85943222dbbe6b7caaa Mon Sep 17 00:00:00 2001 From: Paolo Asperti Date: Wed, 28 Feb 2024 21:17:35 +0100 Subject: [PATCH] arm64 image --- .gitea/workflows/build.yaml | 9 ++------- .gitea/workflows/build_and_push.yaml | 17 +++++------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 894fb8b..0e725a6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,9 +13,6 @@ jobs: image: catthehacker/ubuntu:act-latest steps: - uses: actions/checkout@v4 - with: - submodules: true # Fetch Hugo themes (true OR recursive) - fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -24,11 +21,9 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile - platforms: | - linux/amd64 -# linux/arm64 + platforms: linux/amd64,linux/arm64 push: false diff --git a/.gitea/workflows/build_and_push.yaml b/.gitea/workflows/build_and_push.yaml index 199872a..36c7322 100644 --- a/.gitea/workflows/build_and_push.yaml +++ b/.gitea/workflows/build_and_push.yaml @@ -14,9 +14,6 @@ jobs: image: catthehacker/ubuntu:act-latest steps: - uses: actions/checkout@v4 - with: - submodules: true # Fetch Hugo themes (true OR recursive) - fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -32,14 +29,12 @@ jobs: password: ${{ secrets.REGISTRY_TOKEN }} - name: Build and publish - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile - platforms: | - linux/amd64 -# linux/arm64 - load: true + platforms: linux/amd64,linux/arm64 + # load: true # load doesn't work with multiple platforms tags: git.libreschool.org/bglug/hugo-extended:latest - name: Run Trivy vulnerability scanner @@ -54,12 +49,10 @@ jobs: run: if [ $(jq '.Results[0].Vulnerabilities|length' trivy-results.json) -ne "0" ] ; then exit 1 ; fi - name: Build and publish - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile - platforms: | - linux/amd64 -# linux/arm64 + platforms: linux/amd64,linux/arm64 push: true tags: git.libreschool.org/bglug/hugo-extended:latest