From 7753186593c6d8eb66f59894e2fa7550489490bb Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Fri, 22 Mar 2024 07:52:16 +0100
Subject: [PATCH] Docker Compose: Migrate development config files to
 compose.yaml #4113

Signed-off-by: Michael Mayer <michael@photoprism.app>
---
 .drone.yml                                    | 26 +++++++-------
 .gitignore                                    |  6 ++--
 Makefile                                      | 36 +++++++++----------
 ...er-compose.armv7.yml => compose.armv7.yaml |  2 --
 docker-compose.ci.yml => compose.ci.yaml      |  2 --
 ...-compose.latest.yml => compose.latest.yaml |  2 --
 ...er-compose.local.yml => compose.local.yaml |  2 --
 ...ompose.mariadb.yml => compose.mariadb.yaml |  2 --
 ...er-compose.mysql.yml => compose.mysql.yaml |  2 --
 ...pose.postgres.yml => compose.postgres.yaml |  2 --
 docker-compose.yml => compose.yaml            |  2 --
 scripts/test.sh                               |  8 ++---
 12 files changed, 39 insertions(+), 53 deletions(-)
 rename docker-compose.armv7.yml => compose.armv7.yaml (99%)
 rename docker-compose.ci.yml => compose.ci.yaml (99%)
 rename docker-compose.latest.yml => compose.latest.yaml (99%)
 rename docker-compose.local.yml => compose.local.yaml (99%)
 rename docker-compose.mariadb.yml => compose.mariadb.yaml (99%)
 rename docker-compose.mysql.yml => compose.mysql.yaml (98%)
 rename docker-compose.postgres.yml => compose.postgres.yaml (99%)
 rename docker-compose.yml => compose.yaml (99%)

diff --git a/.drone.yml b/.drone.yml
index dc2ec483d..0fed0be2d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,23 +24,23 @@ steps:
         from_secret: codecov_token
     commands:
       - scripts/login.sh
-      - docker compose -f docker-compose.ci.yml pull
-      - docker compose -f docker-compose.ci.yml stop
-      - docker compose -f docker-compose.ci.yml up -d --build --force-recreate
+      - docker compose -f compose.ci.yaml pull
+      - docker compose -f compose.ci.yaml stop
+      - docker compose -f compose.ci.yaml up -d --build --force-recreate
 
   - name: test-develop
     environment:
       CODECOV_TOKEN:
         from_secret: codecov_token
     commands:
-      - docker compose -f docker-compose.ci.yml exec -e CODECOV_TOKEN=$${CODECOV_TOKEN} -T photoprism make all test-js test-codecov install migrate
+      - docker compose -f compose.ci.yaml exec -e CODECOV_TOKEN=$${CODECOV_TOKEN} -T photoprism make all test-js test-codecov install migrate
     when:
       branch:
         - develop
 
   - name: test
     commands:
-      - docker compose -f docker-compose.ci.yml exec -T photoprism make all test install migrate
+      - docker compose -f compose.ci.yaml exec -T photoprism make all test install migrate
     when:
       branch:
         - preview
@@ -48,7 +48,7 @@ steps:
 
   - name: down
     commands:
-      - docker compose -f docker-compose.ci.yml down
+      - docker compose -f compose.ci.yaml down
     when:
       status:
         - failure
@@ -119,15 +119,15 @@ trigger:
 steps:
   - name: up
     commands:
-      - docker-compose -f docker-compose.ci.yml up -d --build --force-recreate
+      - docker-compose -f compose.ci.yaml up -d --build --force-recreate
 
   - name: test
     commands:
-      - docker-compose -f docker-compose.ci.yml exec -T photoprism make all test install migrate
+      - docker-compose -f compose.ci.yaml exec -T photoprism make all test install migrate
 
   - name: down
     commands:
-      - docker-compose -f docker-compose.ci.yml down
+      - docker-compose -f compose.ci.yaml down
     when:
       status:
         - failure
@@ -159,16 +159,16 @@ steps:
         from_secret: docker_password
     commands:
       - scripts/login.sh
-      - docker-compose -f docker-compose.ci.yml stop
-      - docker-compose -f docker-compose.ci.yml up -d --build --force-recreate
+      - docker-compose -f compose.ci.yaml stop
+      - docker-compose -f compose.ci.yaml up -d --build --force-recreate
 
   - name: test
     commands:
-      - docker-compose -f docker-compose.ci.yml exec -T photoprism make all test-go install migrate
+      - docker-compose -f compose.ci.yaml exec -T photoprism make all test-go install migrate
 
   - name: down
     commands:
-      - docker-compose -f docker-compose.ci.yml down
+      - docker-compose -f compose.ci.yaml down
       - docker system prune -f
     when:
       status:
diff --git a/.gitignore b/.gitignore
index d564820d5..585e885fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,10 @@
 *.pid
 *.db
 *.db-journal
-docker-compose.override.yml
-docker-compose.tmp.yml
+*.override.yml
+*.tmp.yml
+*.override.yaml
+*.tmp.yaml
 
 # Binaries for programs and plugins
 *.exe
diff --git a/Makefile b/Makefile
index bf077d56a..0c153cfc2 100644
--- a/Makefile
+++ b/Makefile
@@ -322,14 +322,14 @@ test-coverage:
 	go tool cover -func coverage.txt  | grep total:
 docker-pull:
 	$(DOCKER_COMPOSE) pull --ignore-pull-failures
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml pull --ignore-pull-failures
+	$(DOCKER_COMPOSE) -f compose.latest.yaml pull --ignore-pull-failures
 docker-build:
 	$(DOCKER_COMPOSE) pull --ignore-pull-failures
 	$(DOCKER_COMPOSE) build
 docker-local-up:
-	$(DOCKER_COMPOSE) -f docker-compose.local.yml up --force-recreate
+	$(DOCKER_COMPOSE) -f compose.local.yaml up --force-recreate
 docker-local-down:
-	$(DOCKER_COMPOSE) -f docker-compose.local.yml down -V
+	$(DOCKER_COMPOSE) -f compose.local.yaml down -V
 develop: docker-develop
 docker-develop: docker-develop-latest
 docker-develop-all: docker-develop-latest docker-develop-other
@@ -532,31 +532,31 @@ docker-release-mantic:
 	docker pull --platform=arm64 photoprism/develop:mantic-slim
 	scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 ce /mantic
 start-local:
-	$(DOCKER_COMPOSE) -f docker-compose.local.yml up -d --wait
+	$(DOCKER_COMPOSE) -f compose.local.yaml up -d --wait
 stop-local:
-	$(DOCKER_COMPOSE) -f docker-compose.local.yml stop
+	$(DOCKER_COMPOSE) -f compose.local.yaml stop
 mysql:
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml pull mysql
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml stop mysql
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml up -d --wait mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml pull mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml stop mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml up -d --wait mysql
 start-mysql:
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml up -d --wait mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml up -d --wait mysql
 stop-mysql:
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml stop mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml stop mysql
 logs-mysql:
-	$(DOCKER_COMPOSE) -f docker-compose.mysql.yml logs -f mysql
+	$(DOCKER_COMPOSE) -f compose.mysql.yaml logs -f mysql
 latest:
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml pull photoprism-latest
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml stop photoprism-latest
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml up -d --wait photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml pull photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml stop photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml up -d --wait photoprism-latest
 start-latest:
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml up photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml up photoprism-latest
 stop-latest:
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml stop photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml stop photoprism-latest
 terminal-latest:
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml exec photoprism-latest bash
+	$(DOCKER_COMPOSE) -f compose.latest.yaml exec photoprism-latest bash
 logs-latest:
-	$(DOCKER_COMPOSE) -f docker-compose.latest.yml logs -f photoprism-latest
+	$(DOCKER_COMPOSE) -f compose.latest.yaml logs -f photoprism-latest
 docker-local: docker-local-mantic
 docker-local-all: docker-local-mantic docker-local-lunar docker-local-jammy docker-local-bookworm docker-local-bullseye docker-local-buster
 docker-local-bookworm:
diff --git a/docker-compose.armv7.yml b/compose.armv7.yaml
similarity index 99%
rename from docker-compose.armv7.yml
rename to compose.armv7.yaml
index 9632e5726..2331fe970 100644
--- a/docker-compose.armv7.yml
+++ b/compose.armv7.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR ARMv7 TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/       ##
 
diff --git a/docker-compose.ci.yml b/compose.ci.yaml
similarity index 99%
rename from docker-compose.ci.yml
rename to compose.ci.yaml
index 8a30d7753..14e0a0293 100644
--- a/docker-compose.ci.yml
+++ b/compose.ci.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.latest.yml b/compose.latest.yaml
similarity index 99%
rename from docker-compose.latest.yml
rename to compose.latest.yaml
index 842a6207c..f26810428 100644
--- a/docker-compose.latest.yml
+++ b/compose.latest.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.local.yml b/compose.local.yaml
similarity index 99%
rename from docker-compose.local.yml
rename to compose.local.yaml
index 9b6e31c89..a9b5177e9 100644
--- a/docker-compose.local.yml
+++ b/compose.local.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.mariadb.yml b/compose.mariadb.yaml
similarity index 99%
rename from docker-compose.mariadb.yml
rename to compose.mariadb.yaml
index 2aa8a1949..e81af5773 100644
--- a/docker-compose.mariadb.yml
+++ b/compose.mariadb.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.mysql.yml b/compose.mysql.yaml
similarity index 98%
rename from docker-compose.mysql.yml
rename to compose.mysql.yaml
index 7318bb778..0f7f03062 100644
--- a/docker-compose.mysql.yml
+++ b/compose.mysql.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.postgres.yml b/compose.postgres.yaml
similarity index 99%
rename from docker-compose.postgres.yml
rename to compose.postgres.yaml
index 816bf1daf..403248a60 100644
--- a/docker-compose.postgres.yml
+++ b/compose.postgres.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/docker-compose.yml b/compose.yaml
similarity index 99%
rename from docker-compose.yml
rename to compose.yaml
index 56f466e20..c2e82316e 100644
--- a/docker-compose.yml
+++ b/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##
 
diff --git a/scripts/test.sh b/scripts/test.sh
index 693069c9c..08f0bd799 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -5,7 +5,7 @@ scripts/docker/login.sh
 
 # Define functions.
 cleanUp() {
-  COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml down --remove-orphans
+  COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml down --remove-orphans
 }
 
 # Make sure containers are not running and don't keep running.
@@ -14,9 +14,9 @@ trap cleanUp INT
 
 # Set up environment and run tests.
 ERROR=0
-COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml pull --ignore-pull-failures && \
-COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml build --pull && \
-COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml run --rm photoprism make all test install migrate || \
+COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml pull --ignore-pull-failures && \
+COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml build --pull && \
+COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml run --rm photoprism make all test install migrate || \
 ERROR=1
 
 # Stop containers.