From b652a3f49b328e74deafb878fd70374fa88bcac6 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 31 Aug 2024 15:58:36 -0700 Subject: [PATCH 1/4] fixing platform reference for the docker tag push action --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2da4d56..4d587de 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - platform: [linux/amd64, linux/arm64] + platform: [amd64, arm64] steps: - name: checkout @@ -35,7 +35,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platform: ${{ matrix.platform }} + platform: ${{ 'linux/' + matrix.platform }} context: "{{defaultContext}}:docker/baseos/gcc1120" push: true - tags: ngeetropics/baseos:testbuild-${{ matrix.platform}} + tags: ngeetropics/baseos:testbuild-${{ matrix.platform }} From ed216f3b28f3b70e958bee1de86d84b6c60a2434 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 31 Aug 2024 16:00:03 -0700 Subject: [PATCH 2/4] update to only run on pulls to a specific branch --- .github/workflows/docker-image.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 4d587de..6d650d2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,8 +1,6 @@ name: Docker image build - base OS on: - push: - branches: [ "ngeet-2024" ] pull_request: branches: [ "ngeet-2024" ] workflow_dispatch: From 6b1ffa23da280180d28fc6c19fbdc56708bb8c98 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 31 Aug 2024 16:06:10 -0700 Subject: [PATCH 3/4] attempting to correct how the platform is designated --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6d650d2..dd27fdc 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,7 +33,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platform: ${{ 'linux/' + matrix.platform }} + platform: ${{ format('linux/{0}', matrix.platform }} context: "{{defaultContext}}:docker/baseos/gcc1120" push: true tags: ngeetropics/baseos:testbuild-${{ matrix.platform }} From 3e2a2fdd20fe4d315f8183542cecb59beec288c1 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 31 Aug 2024 16:12:03 -0700 Subject: [PATCH 4/4] naive correct to handlebar usage --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index dd27fdc..fe309b3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,7 +33,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platform: ${{ format('linux/{0}', matrix.platform }} + platform: linux/${{ matrix.platform }} context: "{{defaultContext}}:docker/baseos/gcc1120" push: true tags: ngeetropics/baseos:testbuild-${{ matrix.platform }}