diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-12-09 16:13:52 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-12-09 16:13:52 +0000 |
| commit | a4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b (patch) | |
| tree | 11f86252771d5e0dda02674d2ebaaca5bca41b7b | |
| parent | Merge branch 'release-v1.24.0' into develop (diff) | |
| parent | Merge pull request #8906 from matrix-org/rav/fix_multiarch_builds (diff) | |
| download | synapse-a4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b.tar.xz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | changelog.d/8906.misc | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index b10cbedd6d..088da55735 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,6 @@ jobs: - image: docker:git steps: - checkout - - setup_remote_docker - docker_prepare - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - docker_build: @@ -20,7 +19,6 @@ jobs: - image: docker:git steps: - checkout - - setup_remote_docker - docker_prepare - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - docker_build: @@ -46,12 +44,16 @@ workflows: commands: docker_prepare: - description: Downloads the buildx cli plugin and enables multiarch images + description: Sets up a remote docker server, downloads the buildx cli plugin, and enables multiarch images parameters: buildx_version: type: string default: "v0.4.1" steps: + - setup_remote_docker: + # 19.03.13 was the most recent available on circleci at the time of + # writing. + version: 19.03.13 - run: apk add --no-cache curl - run: mkdir -vp ~/.docker/cli-plugins/ ~/dockercache - run: curl --silent -L "https://github.com/docker/buildx/releases/download/<< parameters.buildx_version >>/buildx-<< parameters.buildx_version >>.linux-amd64" > ~/.docker/cli-plugins/docker-buildx diff --git a/changelog.d/8906.misc b/changelog.d/8906.misc new file mode 100644 index 0000000000..8b95e4c553 --- /dev/null +++ b/changelog.d/8906.misc @@ -0,0 +1 @@ +Fix multiarch docker image builds. |