Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 2d327d2

Browse files
authored
Skip the initial amd64-only Docker build (#11810)
PyNaCl's recent 1.5.0 release on PyPi includes arm64 wheels, which means our arm64 docker images now build in a sensible amount of time, so we can skip the amd64-only build.
1 parent 02d99f0 commit 2d327d2

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
username: ${{ secrets.DOCKERHUB_USERNAME }}
3535
password: ${{ secrets.DOCKERHUB_TOKEN }}
3636

37+
# TODO: consider using https://github.com/docker/metadata-action instead of this
38+
# custom magic
3739
- name: Calculate docker image tag
3840
id: set-tag
3941
run: |
@@ -53,18 +55,6 @@ jobs:
5355
esac
5456
echo "::set-output name=tag::$tag"
5557
56-
# for release builds, we want to get the amd64 image out asap, so first
57-
# we do an amd64-only build, before following up with a multiarch build.
58-
- name: Build and push amd64
59-
uses: docker/build-push-action@v2
60-
if: "${{ startsWith(github.ref, 'refs/tags/v') }}"
61-
with:
62-
push: true
63-
labels: "gitsha1=${{ github.sha }}"
64-
tags: "matrixdotorg/synapse:${{ steps.set-tag.outputs.tag }}"
65-
file: "docker/Dockerfile"
66-
platforms: linux/amd64
67-
6858
- name: Build and push all platforms
6959
uses: docker/build-push-action@v2
7060
with:

changelog.d/11810.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Docker: skip the initial amd64-only build and go straight to multiarch.

0 commit comments

Comments
 (0)