Use upstream auto-config 😳

This commit is contained in:
3wc 2020-09-09 01:01:15 +02:00
parent af10cabaf8
commit 268f55d829
3 changed files with 10 additions and 38 deletions

View File

@ -2,5 +2,6 @@ export DOMAIN=nextcloud.example.com
export STACK_NAME=nextcloud
export LETS_ENCRYPT_ENV=production
export DB_ROOT_PASSWD_VERSION=v1
export DB_PASSWD_VERSION=v1
export DB_ROOT_PASSWORD_VERSION=v1
export DB_PASSWORD_VERSION=v1
export ADMIN_PASSWORD_VERSION=v1

View File

@ -9,10 +9,15 @@ services:
- db_password
- admin_password
environment:
- MYSQL_HOST=mariadb
- MYSQL_DATABASE=nextcloud
- DOMAIN=${DOMAIN}
- STACK_NAME=${STACK_NAME}
- MYSQL_HOST=mariadb
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
- NEXTCLOUD_ADMIN_USER=admin
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
- NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
volumes:
- nextapps:/var/www/html/custom_apps:cached
- nextdata:/var/www/html/data:cached
@ -26,12 +31,6 @@ services:
timeout: 10s
retries: 10
start_period: 1m
configs:
- source: entrypoint_conf
target: /docker-entrypoint.sh
mode: 0555
user: www-data
group: www-data
deploy:
restart_policy:
condition: on-failure
@ -43,8 +42,6 @@ services:
- "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"
#entrypoint: ["setpriv", "--reuid=www-data", "--regid=www-data", "--init-groups", "/docker-entrypoint.sh"]
entrypoint: ["tail", "-f", "/dev/null"]
mariadb:
image: "mariadb:10.5"
@ -82,9 +79,3 @@ networks:
proxy:
external: true
internal:
configs:
entrypoint_conf:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang

View File

@ -1,20 +0,0 @@
#!/bin/bash
set -x
SUDO="setpriv --reuid=www-data --regid=www-data --init-groups"
OCC="php /var/www/html/occ"
if ! $SUDO $OCC status | grep -q 'installed: true'; then
$SUDO $OCC --no-ansi -n maintenance:install \
--database "mysql" \
--database-name "nextcloud" \
--database-host "mariadb" \
--database-user "nextcloud" \
--database-pass "$(tr -d '\n' < /run/secrets/db_password)" \
--admin-pass "$(tr -d '\n' < /run/secrets/admin_password)"
fi
$SUDO php $OCC config:system:set trusted_domains 1 --value={{ env "DOMAIN" }}
/entrypoint.sh apache2-foreground