johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Docker Compose: Migrate development config files to compose.yaml #4113

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2024-03-22 07:52:16 +01:00
parent edac621daf
commit 7753186593
12 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
.drone.yml
View File

@@ -24,23 +24,23 @@ steps:
from_secret: codecov_token from_secret: codecov_token
commands: commands:
- scripts/login.sh - scripts/login.sh
- docker compose -f docker-compose.ci.yml pull - docker compose -f compose.ci.yaml pull
- docker compose -f docker-compose.ci.yml stop - docker compose -f compose.ci.yaml stop
- 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-develop - name: test-develop
environment: environment:
CODECOV_TOKEN: CODECOV_TOKEN:
from_secret: codecov_token from_secret: codecov_token
commands: 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: when:
branch: branch:
- develop - develop
- name: test - name: test
commands: 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: when:
branch: branch:
- preview - preview
@@ -48,7 +48,7 @@ steps:
- name: down - name: down
commands: commands:
- docker compose -f docker-compose.ci.yml down - docker compose -f compose.ci.yaml down
when: when:
status: status:
- failure - failure
@@ -119,15 +119,15 @@ trigger:
steps: steps:
- name: up - name: up
commands: 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 - name: test
commands: 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 - name: down
commands: commands:
- docker-compose -f docker-compose.ci.yml down - docker-compose -f compose.ci.yaml down
when: when:
status: status:
- failure - failure
@@ -159,16 +159,16 @@ steps:
from_secret: docker_password from_secret: docker_password
commands: commands:
- scripts/login.sh - scripts/login.sh
- docker-compose -f docker-compose.ci.yml stop - docker-compose -f compose.ci.yaml stop
- 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 - name: test
commands: 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 - name: down
commands: commands:
- docker-compose -f docker-compose.ci.yml down - docker-compose -f compose.ci.yaml down
- docker system prune -f - docker system prune -f
when: when:
status: status:

6
.gitignore vendored
View File

@@ -25,8 +25,10 @@
*.pid *.pid
*.db *.db
*.db-journal *.db-journal
docker-compose.override.yml *.override.yml
docker-compose.tmp.yml *.tmp.yml
*.override.yaml
*.tmp.yaml
# Binaries for programs and plugins # Binaries for programs and plugins
*.exe *.exe

36
Makefile
View File

@@ -322,14 +322,14 @@ test-coverage:
go tool cover -func coverage.txt | grep total: go tool cover -func coverage.txt | grep total:
docker-pull: docker-pull:
$(DOCKER_COMPOSE) pull --ignore-pull-failures $(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-build:
$(DOCKER_COMPOSE) pull --ignore-pull-failures $(DOCKER_COMPOSE) pull --ignore-pull-failures
$(DOCKER_COMPOSE) build $(DOCKER_COMPOSE) build
docker-local-up: 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-local-down:
$(DOCKER_COMPOSE) -f docker-compose.local.yml down -V $(DOCKER_COMPOSE) -f compose.local.yaml down -V
develop: docker-develop develop: docker-develop
docker-develop: docker-develop-latest docker-develop: docker-develop-latest
docker-develop-all: docker-develop-latest docker-develop-other docker-develop-all: docker-develop-latest docker-develop-other
@@ -532,31 +532,31 @@ docker-release-mantic:
docker pull --platform=arm64 photoprism/develop:mantic-slim docker pull --platform=arm64 photoprism/develop:mantic-slim
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 ce /mantic scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 ce /mantic
start-local: start-local:
$(DOCKER_COMPOSE) -f docker-compose.local.yml up -d --wait $(DOCKER_COMPOSE) -f compose.local.yaml up -d --wait
stop-local: stop-local:
$(DOCKER_COMPOSE) -f docker-compose.local.yml stop $(DOCKER_COMPOSE) -f compose.local.yaml stop
mysql: mysql:
$(DOCKER_COMPOSE) -f docker-compose.mysql.yml pull mysql $(DOCKER_COMPOSE) -f compose.mysql.yaml pull mysql
$(DOCKER_COMPOSE) -f docker-compose.mysql.yml stop mysql $(DOCKER_COMPOSE) -f compose.mysql.yaml stop mysql
$(DOCKER_COMPOSE) -f docker-compose.mysql.yml up -d --wait mysql $(DOCKER_COMPOSE) -f compose.mysql.yaml up -d --wait mysql
start-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: stop-mysql:
$(DOCKER_COMPOSE) -f docker-compose.mysql.yml stop mysql $(DOCKER_COMPOSE) -f compose.mysql.yaml stop mysql
logs-mysql: logs-mysql:
$(DOCKER_COMPOSE) -f docker-compose.mysql.yml logs -f mysql $(DOCKER_COMPOSE) -f compose.mysql.yaml logs -f mysql
latest: latest:
$(DOCKER_COMPOSE) -f docker-compose.latest.yml pull photoprism-latest $(DOCKER_COMPOSE) -f compose.latest.yaml pull photoprism-latest
$(DOCKER_COMPOSE) -f docker-compose.latest.yml stop photoprism-latest $(DOCKER_COMPOSE) -f compose.latest.yaml stop photoprism-latest
$(DOCKER_COMPOSE) -f docker-compose.latest.yml up -d --wait photoprism-latest $(DOCKER_COMPOSE) -f compose.latest.yaml up -d --wait photoprism-latest
start-latest: start-latest:
$(DOCKER_COMPOSE) -f docker-compose.latest.yml up photoprism-latest $(DOCKER_COMPOSE) -f compose.latest.yaml up photoprism-latest
stop-latest: stop-latest:
$(DOCKER_COMPOSE) -f docker-compose.latest.yml stop photoprism-latest $(DOCKER_COMPOSE) -f compose.latest.yaml stop photoprism-latest
terminal-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: 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: 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-all: docker-local-mantic docker-local-lunar docker-local-jammy docker-local-bookworm docker-local-bullseye docker-local-buster
docker-local-bookworm: docker-local-bookworm:

2
docker-compose.armv7.yml → compose.armv7.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR ARMv7 TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR ARMv7 TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.ci.yml → compose.ci.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.latest.yml → compose.latest.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.local.yml → compose.local.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.mariadb.yml → compose.mariadb.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.mysql.yml → compose.mysql.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.postgres.yml → compose.postgres.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

2
docker-compose.yml → compose.yaml
View File

@@ -1,5 +1,3 @@
version: '3.5'
## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ## ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION ##
## Setup: https://docs.photoprism.app/developer-guide/setup/ ## ## Setup: https://docs.photoprism.app/developer-guide/setup/ ##

8
scripts/test.sh
View File

@@ -5,7 +5,7 @@ scripts/docker/login.sh
# Define functions. # Define functions.
cleanUp() { 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. # Make sure containers are not running and don't keep running.
@@ -14,9 +14,9 @@ trap cleanUp INT
# Set up environment and run tests. # Set up environment and run tests.
ERROR=0 ERROR=0
COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml pull --ignore-pull-failures && \ COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml pull --ignore-pull-failures && \
COMPOSE_PROJECT_NAME=ci docker-compose -f docker-compose.ci.yml build --pull && \ COMPOSE_PROJECT_NAME=ci docker-compose -f compose.ci.yaml 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 run --rm photoprism make all test install migrate || \
ERROR=1 ERROR=1
# Stop containers. # Stop containers.