diff --git a/abra-commands.sh b/abra-commands.sh index d459dab..999163f 100644 --- a/abra-commands.sh +++ b/abra-commands.sh @@ -1,3 +1,3 @@ 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 "$@" } diff --git a/compose.yml b/compose.yml index 33e1912..37dd6aa 100644 --- a/compose.yml +++ b/compose.yml @@ -1,17 +1,17 @@ version: "3.8" services: - nextcloud: + app: image: nextcloud:latest depends_on: - - mariadb + - db secrets: - db_password - admin_password environment: - DOMAIN=${DOMAIN} - STACK_NAME=${STACK_NAME} - - MYSQL_HOST=mariadb + - MYSQL_HOST=db - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_PASSWORD_FILE=/run/secrets/db_password @@ -34,18 +34,19 @@ services: retries: 10 start_period: 1m deploy: - restart_policy: - condition: on-failure + update_config: + failure_action: rollback + order: start-first labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - "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}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80" - mariadb: + db: image: "mariadb:10.5" environment: - MYSQL_DATABASE=nextcloud