Rename services, fix `abra occ`

See compose-stacks/organising#19
This commit is contained in:
3wc 2020-09-28 01:16:36 +02:00
parent ccc8212fac
commit 59d1c0270b
2 changed files with 9 additions and 8 deletions

View File

@ -1,3 +1,3 @@
sub_occ(){ sub_occ(){
sub_run_args nextcloud "-u www-data" php /var/www/html/occ "$@" sub_run -u www-data app php /var/www/html/occ "$@"
} }

View File

@ -1,17 +1,17 @@
version: "3.8" version: "3.8"
services: services:
nextcloud: app:
image: nextcloud:latest image: nextcloud:latest
depends_on: depends_on:
- mariadb - db
secrets: secrets:
- db_password - db_password
- admin_password - admin_password
environment: environment:
- DOMAIN=${DOMAIN} - DOMAIN=${DOMAIN}
- STACK_NAME=${STACK_NAME} - STACK_NAME=${STACK_NAME}
- MYSQL_HOST=mariadb - MYSQL_HOST=db
- MYSQL_DATABASE=nextcloud - MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud - MYSQL_USER=nextcloud
- MYSQL_PASSWORD_FILE=/run/secrets/db_password - MYSQL_PASSWORD_FILE=/run/secrets/db_password
@ -34,18 +34,19 @@ services:
retries: 10 retries: 10
start_period: 1m start_period: 1m
deploy: deploy:
restart_policy: update_config:
condition: on-failure failure_action: rollback
order: start-first
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy"
- "traefik.http.routers.${STACK_NAME}.tls=true" - "traefik.http.routers.${STACK_NAME}.tls=true"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
mariadb: db:
image: "mariadb:10.5" image: "mariadb:10.5"
environment: environment:
- MYSQL_DATABASE=nextcloud - MYSQL_DATABASE=nextcloud