diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2022-01-24 18:31:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 18:31:23 +0000 |
| commit | 2d327d25bf5d48460714ca8860dca881b6bfa72c (patch) | |
| tree | aec46e4274939e55b037f8fddf9e5f570a5a6b2c | |
| parent | Apply a timeout to reading the body when fetching a file. (#11784) (diff) | |
| download | synapse-2d327d25bf5d48460714ca8860dca881b6bfa72c.tar.xz | |
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.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/docker.yml | 14 | ||||
| -rw-r--r-- | changelog.d/11810.misc | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3276d1e122..124b17458f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,6 +34,8 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + # TODO: consider using https://github.com/docker/metadata-action instead of this + # custom magic - name: Calculate docker image tag id: set-tag run: | @@ -53,18 +55,6 @@ jobs: esac echo "::set-output name=tag::$tag" - # for release builds, we want to get the amd64 image out asap, so first - # we do an amd64-only build, before following up with a multiarch build. - - name: Build and push amd64 - uses: docker/build-push-action@v2 - if: "${{ startsWith(github.ref, 'refs/tags/v') }}" - with: - push: true - labels: "gitsha1=${{ github.sha }}" - tags: "matrixdotorg/synapse:${{ steps.set-tag.outputs.tag }}" - file: "docker/Dockerfile" - platforms: linux/amd64 - - name: Build and push all platforms uses: docker/build-push-action@v2 with: diff --git a/changelog.d/11810.misc b/changelog.d/11810.misc new file mode 100644 index 0000000000..5579b85979 --- /dev/null +++ b/changelog.d/11810.misc @@ -0,0 +1 @@ +Docker: skip the initial amd64-only build and go straight to multiarch. |