From cdfa420fb07da29b2efcf24035617e3f9823e829 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Wed, 2 Jun 2021 12:25:35 +0200 Subject: [PATCH] Docker: Provide multi-arch build for webdav dummy #1158 #1328 --- Makefile | 7 ++++--- docker-compose.drone.yml | 2 +- docker-compose.postgres.yml | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fc069c158..fa13313b6 100644 --- a/Makefile +++ b/Makefile @@ -188,9 +188,10 @@ docker-demo-local: scripts/docker-build.sh demo $(DOCKER_TAG) scripts/docker-push.sh demo $(DOCKER_TAG) docker-webdav: - docker pull golang:1 - scripts/docker-build.sh webdav $(DOCKER_TAG) - scripts/docker-push.sh webdav $(DOCKER_TAG) + docker pull --platform=amd64 golang:1 + docker pull --platform=arm64 golang:1 + docker pull --platform=arm golang:1 + scripts/docker-buildx.sh webdav linux/amd64,linux/arm64,linux/arm $(DOCKER_TAG) lint-js: (cd frontend && npm run lint) fmt-js: diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml index d9cfbb6db..fefabd3fe 100644 --- a/docker-compose.drone.yml +++ b/docker-compose.drone.yml @@ -151,4 +151,4 @@ services: MYSQL_DATABASE: photoprism webdav-dummy: - image: photoprism/webdav:20200825 + image: photoprism/webdav:20210602 diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index f26f001e6..7d1687f87 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -70,7 +70,7 @@ services: POSTGRES_PASSWORD: photoprism webdav-dummy: - image: photoprism/webdav:20200825 + image: photoprism/webdav:20210602 volumes: go-mod: diff --git a/docker-compose.yml b/docker-compose.yml index 1584189ba..d4b5ecd49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,7 +90,7 @@ services: MYSQL_DATABASE: photoprism webdav-dummy: - image: photoprism/webdav:20200825 + image: photoprism/webdav:20210602 volumes: go-mod: