From 6611dc08ca5053d6a8b753ae9132609f5bbc4c35 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Sun, 18 Sep 2022 15:32:32 +0200
Subject: [PATCH] Develop: Update docker-compose.yml networks and "make
 docker-pull"

Signed-off-by: Michael Mayer <michael@photoprism.app>
---
 Makefile                   | 8 ++------
 docker-compose.latest.yml  | 4 ++--
 docker-compose.local.yml   | 4 ++--
 docker-compose.mariadb.yml | 4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2c3a7d747..06be0325a 100644
--- a/Makefile
+++ b/Makefile
@@ -279,12 +279,8 @@ test-coverage:
 	go test -parallel 1 -count 1 -cpu 1 -failfast -tags slow -timeout 30m -coverprofile coverage.txt -covermode atomic ./pkg/... ./internal/...
 	go tool cover -html=coverage.txt -o coverage.html
 docker-pull:
-	docker pull mariadb:10.8
-	docker pull photoprism/traefik:latest
-	docker pull photoprism/develop:bookworm
-	docker pull photoprism/develop:bookworm-slim
-	docker pull photoprism/photoprism:preview
-	docker pull photoprism/photoprism:latest
+	docker-compose pull --ignore-pull-failures
+	docker-compose -f docker-compose.latest.yml pull --ignore-pull-failures
 docker-develop: docker-develop-latest
 docker-develop-all: docker-develop-latest docker-develop-other
 docker-develop-latest: docker-develop-ubuntu docker-develop-armv7
diff --git a/docker-compose.latest.yml b/docker-compose.latest.yml
index bee8d8e99..aa2bc2f8b 100644
--- a/docker-compose.latest.yml
+++ b/docker-compose.latest.yml
@@ -66,5 +66,5 @@ services:
 ## Join shared "photoprism-develop" network
 networks:
   default:
-    external:
-      name: photoprism-develop
+    name: photoprism-develop
+    external: true
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 69a408aa3..e1b536a8c 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -72,5 +72,5 @@ services:
 ## Join shared "photoprism-develop" network
 networks:
   default:
-    external:
-      name: photoprism-develop
+    name: photoprism-develop
+    external: true
diff --git a/docker-compose.mariadb.yml b/docker-compose.mariadb.yml
index 892b2960d..c330b8d14 100644
--- a/docker-compose.mariadb.yml
+++ b/docker-compose.mariadb.yml
@@ -119,5 +119,5 @@ services:
 ## Join shared "photoprism-develop" network
 networks:
   default:
-    external:
-      name: photoprism-develop
+    name: photoprism-develop
+    external: true