merged master

This commit is contained in:
Kevin Veen-Birkenbach 2021-08-18 16:16:14 +02:00
commit 64d46c52b0
2 changed files with 6 additions and 4 deletions

View File

@ -48,3 +48,5 @@ To use occ run:
## further information ## further information
- https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml - https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
- https://goneuland.de/nextcloud-upgrade-auf-neue-versionen-mittels-docker/
- https://help.nextcloud.com/t/cant-start-nextcloud-because-the-version-of-the-data-is-higher-than-the-docker-image-version-and-downgrading-is-not-supported/109438

View File

@ -21,23 +21,23 @@
project_name: nextcloud project_name: nextcloud
definition: definition:
application: application:
image: nextcloud:fpm-alpine image: "nextcloud:{{nextcloud_version}}-fpm-alpine"
restart: always restart: always
log_driver: journald log_driver: journald
links: links:
- database - database
volumes: volumes:
- nextcloud-data:/var/www/html - nextcloud-data:/var/www/html
# Maybe error in following line # Maybe error in following line
expose: expose:
- "9000" - "9000"
environment: environment:
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
MYSQL_DATABASE: "nextcloud" MYSQL_DATABASE: "nextcloud"
MYSQL_USER: "nextcloud" MYSQL_USER: "nextcloud"
MYSQL_PASSWORD: "{{nextcloud_database_password}}" MYSQL_PASSWORD: "{{nextcloud_database_password}}"
MYSQL_HOST: database:3306 MYSQL_HOST: database:3306
DOCKER_CLIENT_TIMEOUT: 120
COMPOSE_HTTP_TIMEOUT: 120
database: database:
log_driver: journald log_driver: journald
image: mariadb image: mariadb