Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Richard van der Hoff 2020-12-09 16:13:52 +00:00
commit a4a5c7a35e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.circleci/config.yml
View File

@ -5,7 +5,6 @@ jobs:
- image: docker:git - image: docker:git
steps: steps:
- checkout - checkout
- setup_remote_docker
- docker_prepare - docker_prepare
- run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
- docker_build: - docker_build:
@ -20,7 +19,6 @@ jobs:
- image: docker:git - image: docker:git
steps: steps:
- checkout - checkout
- setup_remote_docker
- docker_prepare - docker_prepare
- run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
- docker_build: - docker_build:
@ -46,12 +44,16 @@ workflows:
commands: commands:
docker_prepare: 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: parameters:
buildx_version: buildx_version:
type: string type: string
default: "v0.4.1" default: "v0.4.1"
steps: 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: apk add --no-cache curl
- run: mkdir -vp ~/.docker/cli-plugins/ ~/dockercache - 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 - 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

1
changelog.d/8906.misc Normal file
View File

@ -0,0 +1 @@
Fix multiarch docker image builds.