Add missing files to Nextcloud config + some tweaks

This commit is contained in:
Paul-Henri Froidmont 2018-01-12 01:37:27 +01:00
parent 5226d54eb3
commit 3c4d76c76e
9 changed files with 84 additions and 57 deletions

View file

@ -17,7 +17,7 @@ services:
- VIRTUAL_PORT=80
depends_on:
- app
- collabora
# - collabora
networks:
- proxy-tier
- default
@ -26,8 +26,8 @@ services:
app:
build: ./app
volumes:
- ./config/config.php:/var/www/html/config/config.php
- /var/lib/nextcloud:/var/www/html
- ./config:/var/www/html/config
- /media:/media
- /etc/localtime:/etc/localtime:ro
environment:
@ -39,27 +39,6 @@ services:
- redis
restart: always
cron:
build: ./app
restart: always
volumes:
- /var/lib/nextcloud:/var/www/html
user: www-data
entrypoint: |
bash -c 'bash -s <<EOF
trap "break;exit" SIGHUP SIGINT SIGTERM
while [ ! -f /var/www/html/config/config.php ]; do
sleep 1
done
while true; do
php -f /var/www/html/cron.php
sleep 15m
done
EOF'
depends_on:
- db
- redis
db:
image: mariadb
volumes:
@ -79,21 +58,21 @@ services:
image: redis
restart: always
collabora:
image: collabora/code
cap_add:
- MKNOD
expose:
- 9980
environment:
- domain=${CLOUD_DOMAIN}
- VIRTUAL_HOST=${COLLABORA_DOMAIN}
- VIRTUAL_NETWORK=nginx-proxy
- VIRTUAL_PORT=9980
# collabora:
# image: collabora/code
# cap_add:
# - MKNOD
# expose:
# - 9980
# environment:
# - domain=${CLOUD_DOMAIN}
# - VIRTUAL_HOST=${COLLABORA_DOMAIN}
# - VIRTUAL_NETWORK=nginx-proxy
# - VIRTUAL_PORT=9980
# - VIRTUAL_PROTO=https
# - LETSENCRYPT_HOST=${COLLABORA_DOMAIN}
# - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL}
networks:
- proxy-tier
- default
restart: always
# networks:
# - proxy-tier
# - default
# restart: always