Docker: Change "docker-compose" command to "docker compose" #1192

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2022-11-05 16:31:08 +01:00
parent a19ff56d67
commit 6c3b4603a8
3 changed files with 36 additions and 36 deletions

View file

@ -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 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
- 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 docker-compose.ci.yml 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 docker-compose.ci.yml 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 docker-compose.ci.yml down
when:
status:
- failure

View file

@ -67,7 +67,7 @@ upgrade: dep-upgrade-js dep-upgrade
devtools: install-go dep-npm
.SILENT: help;
logs:
docker-compose logs -f
docker compose logs -f
help:
@echo "For build instructions, visit <https://docs.photoprism.app/developer-guide/>."
fix-permissions:
@ -140,10 +140,10 @@ start:
stop:
./photoprism stop
terminal:
docker-compose exec -u $(UID) photoprism bash
docker compose exec -u $(UID) photoprism bash
rootshell: root-terminal
root-terminal:
docker-compose exec -u root photoprism bash
docker compose exec -u root photoprism bash
migrate:
go run cmd/photoprism/photoprism.go migrations run
generate:
@ -286,11 +286,11 @@ 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-compose pull --ignore-pull-failures
docker-compose -f docker-compose.latest.yml pull --ignore-pull-failures
docker compose pull --ignore-pull-failures
docker compose -f docker-compose.latest.yml pull --ignore-pull-failures
docker-build:
docker-compose pull --ignore-pull-failures
docker-compose build
docker compose pull --ignore-pull-failures
docker compose build
docker-develop: docker-develop-latest
docker-develop-all: docker-develop-latest docker-develop-other
docker-develop-latest: docker-develop-ubuntu docker-develop-armv7
@ -431,31 +431,31 @@ docker-release-impish:
docker pull --platform=arm64 ubuntu:impish
scripts/docker/buildx-multi.sh photoprism linux/amd64,linux/arm64 impish /impish
start-local:
docker-compose -f docker-compose.local.yml up -d --wait
docker compose -f docker-compose.local.yml up -d --wait
stop-local:
docker-compose -f docker-compose.local.yml stop
docker compose -f docker-compose.local.yml 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 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
start-mysql:
docker-compose -f docker-compose.mysql.yml up -d --wait mysql
docker compose -f docker-compose.mysql.yml up -d --wait mysql
stop-mysql:
docker-compose -f docker-compose.mysql.yml stop mysql
docker compose -f docker-compose.mysql.yml stop mysql
logs-mysql:
docker-compose -f docker-compose.mysql.yml logs -f mysql
docker compose -f docker-compose.mysql.yml 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 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
start-latest:
docker-compose -f docker-compose.latest.yml up photoprism-latest
docker compose -f docker-compose.latest.yml up photoprism-latest
stop-latest:
docker-compose -f docker-compose.latest.yml stop photoprism-latest
docker compose -f docker-compose.latest.yml stop photoprism-latest
terminal-latest:
docker-compose -f docker-compose.latest.yml exec photoprism-latest bash
docker compose -f docker-compose.latest.yml exec photoprism-latest bash
logs-latest:
docker-compose -f docker-compose.latest.yml logs -f photoprism-latest
docker compose -f docker-compose.latest.yml logs -f photoprism-latest
docker-local: docker-local-bookworm
docker-local-all: docker-local-bookworm docker-local-bullseye docker-local-buster docker-local-jammy
docker-local-bookworm:

View file

@ -1,15 +1,15 @@
.PHONY: all restart terminal logs;
all: restart
restart:
docker-compose pull demo
docker-compose stop demo
docker compose pull demo
docker compose stop demo
find config -type f -name 'settings.yml' -delete
docker-compose up -d --force-recreate demo
docker compose up -d --force-recreate demo
install:
docker-compose pull
docker-compose stop
docker-compose up -d
docker compose pull
docker compose stop
docker compose up -d
terminal:
docker-compose exec demo bash
docker compose exec demo bash
logs:
docker-compose logs --tail=50 -f
docker compose logs --tail=50 -f