Compare commits

..

No commits in common. "master" and "new" have entirely different histories.
master ... new

4 changed files with 13 additions and 97 deletions

View File

@ -1,5 +0,0 @@
Don't forget to add innextcloud/config/config.php:
'overwrite.cli.url' => 'http://next.airdog.site',
Otherwise android clients don't work

View File

@ -1,2 +1 @@
Do NOT use the vhosts and certs and proxy directories.
ONLY need the docker-compose file
Do NOT use the vhosts and certs and proxy directories.

View File

@ -1,81 +0,0 @@
version: '3'
services:
proxy:
image: jwilder/nginx-proxy:alpine
labels:
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true"
container_name: nextcloud-proxy
networks:
- nextcloud_network
ports:
- 80:80
- 443:443
volumes:
- ./proxy/conf.d:/etc/nginx/conf.d:rw
- ./proxy/vhost.d:/etc/nginx/vhost.d:rw
- ./proxy/html:/usr/share/nginx/html:rw
- ./proxy/certs:/etc/nginx/certs:ro
- /etc/localtime:/etc/localtime:ro
- /var/run/docker.sock:/tmp/docker.sock:ro
restart: unless-stopped
letsencrypt:
image: jrcs/letsencrypt-nginx-proxy-companion
container_name: nextcloud-letsencrypt
depends_on:
- proxy
networks:
- nextcloud_network
volumes:
- ./proxy/certs:/etc/nginx/certs:rw
- ./proxy/vhost.d:/etc/nginx/vhost.d:rw
- ./proxy/html:/usr/share/nginx/html:rw
- /etc/localtime:/etc/localtime:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
restart: unless-stopped
db:
image: mariadb
container_name: nextcloud-mariadb
networks:
- nextcloud_network
volumes:
- db:/var/lib/mysql
- /etc/localtime:/etc/localtime:ro
environment:
- MYSQL_ROOT_PASSWORD=toor
- MYSQL_PASSWORD=mysql
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud
restart: unless-stopped
app:
image: nextcloud:latest
container_name: nextcloud-app
networks:
- nextcloud_network
depends_on:
- letsencrypt
- proxy
- db
volumes:
- nextcloud:/var/www/html
- ./app/config:/var/www/html/config
- ./app/custom_apps:/var/www/html/custom_apps
- ./app/data:/var/www/html/data
- ./app/themes:/var/www/html/themes
- /etc/localtime:/etc/localtime:ro
environment:
- VIRTUAL_HOST=nextcloud.YOUR-DOMAIN
- LETSENCRYPT_HOST=nextcloud.YOUR-DOMAIN
- LETSENCRYPT_EMAIL=YOUR-EMAIL
restart: unless-stopped
volumes:
nextcloud:
db:
networks:
nextcloud_network:

View File

@ -2,9 +2,8 @@ version: '3'
services:
db:
image: mariadb:10.5
image: mariadb
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
# command: --innodb-read-only-compressed=OFF
restart: always
volumes:
- ./db:/var/lib/mysql
@ -17,29 +16,33 @@ services:
app:
image: nextcloud:latest
image: nextcloud:apache
restart: always
# ports:
# - 8080:80
volumes:
- ./nextcloud:/var/www/html
- ./php.ini:/usr/local/etc/php/conf.d/zzz-custom.ini
environment:
- MYSQL_HOST=db
- VIRTUAL_HOST=next.franv.site
- LETSENCRYPT_HOST=next.franv.site
- VIRTUAL_HOST=next.airdog.site
- LETSENCRYPT_HOST=next.airdog.site
- LETSENCRYPT_EMAIL=ouch@thetrauma.org
env_file:
- db.env
labels:
- diun.enable=true
depends_on:
- db
networks:
backend_next:
acme-companion_proxy-tier:
franvproxy_proxy-tier:
networks:
backend_next:
acme-companion_proxy-tier:
driver: bridge
franvproxy_proxy-tier:
external: true
#volumes:
# db:
# nextcloud: