From 250bb487bec8232ab537fb06c1bd32632da1a8f4 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 10 Aug 2021 10:59:46 -0700 Subject: [PATCH 1/3] Multiarch Docker builds --- .github/workflows/docker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 65e21a3566..793e17e842 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,8 +1,6 @@ name: docker on: push: - branches: - - main jobs: docker: name: push kjconroy/sqlc:devel @@ -22,6 +20,7 @@ jobs: with: context: . file: ./Dockerfile + platforms: linux/amd64,linux/arm64/v8 build-args: | github_ref=${{ github.ref }} github_sha=${{ github.sha }} @@ -30,4 +29,3 @@ jobs: org.opencontainers.image.source=${{ github.event.repository.html_url }} org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} - push: true From 5fe208a04d2b2bbac5af7c85a094299caeab5555 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 10 Aug 2021 11:06:32 -0700 Subject: [PATCH 2/3] Setup QEMU for multiarch builds --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 793e17e842..abbda909fc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,6 +12,7 @@ jobs: echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') - uses: actions/checkout@v2.3.4 - uses: docker/setup-buildx-action@v1 + - uses: docker/setup-qemu-action@v1 - uses: docker/login-action@v1.10.0 with: username: kjconroy From 54e4be7ae97bcb4daecb68480b2f3ef1db5b6b5d Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 10 Aug 2021 17:37:19 -0700 Subject: [PATCH 3/3] Publish multiarch containers --- .github/workflows/docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index abbda909fc..cfefd4c79a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,8 @@ name: docker on: push: + branches: + main jobs: docker: name: push kjconroy/sqlc:devel @@ -30,3 +32,4 @@ jobs: org.opencontainers.image.source=${{ github.event.repository.html_url }} org.opencontainers.image.created=${{ steps.prep.outputs.created }} org.opencontainers.image.revision=${{ github.sha }} + push: true