diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index c05d7d8e..c765190c 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -1,9 +1,6 @@ services: - # Note: MariaDB is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 command: --transaction-isolation=READ-COMMITTED restart: always volumes: @@ -15,8 +12,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index 64faef6c..90520e08 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -1,9 +1,6 @@ services: - # Note: MariaDB is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 command: --transaction-isolation=READ-COMMITTED restart: always volumes: @@ -15,8 +12,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -36,18 +31,14 @@ services: - db - redis - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ web: - image: nginx:alpine-slim + build: ./web restart: always ports: - 127.0.0.1:8080:80 volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./web/nginx.conf:/etc/nginx/nginx.conf:ro - # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing) - nextcloud:/var/www/html:z,ro + # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing) depends_on: - app diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile new file mode 100644 index 00000000..9e620aff --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/insecure/postgres/apache/compose.yaml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml index 8ae34013..19c75ba4 100644 --- a/.examples/docker-compose/insecure/postgres/apache/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml @@ -1,8 +1,5 @@ services: - # Note: PostgreSQL is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/postgres db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server image: postgres:alpine restart: always volumes: @@ -10,8 +7,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always diff --git a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml index 8a88afd4..4e268cab 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml @@ -1,8 +1,5 @@ services: - # Note: PostgreSQL is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/postgres db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server image: postgres:alpine restart: always volumes: @@ -10,8 +7,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -31,18 +26,14 @@ services: - db - redis - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ web: - image: nginx:alpine-slim + build: ./web restart: always ports: - 127.0.0.1:8080:80 volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./web/nginx.conf:/etc/nginx/nginx.conf:ro - # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing) - nextcloud:/var/www/html:z,ro + # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing) depends_on: - app diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile new file mode 100644 index 00000000..9e620aff --- /dev/null +++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml index e1132818..e1a461d2 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -1,9 +1,6 @@ services: - # Note: MariaDB is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 command: --transaction-isolation=READ-COMMITTED restart: always volumes: @@ -15,8 +12,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -38,6 +33,9 @@ services: depends_on: - db - redis + # Added proxy container dependency below. + # It is unclear on when or why it happens, but sometimes NC manages to start before the proxy + # and it breaks for whatever weird reason resulting in the need of manual proxy container restart. - proxy networks: - proxy-tier @@ -54,9 +52,6 @@ services: - db - redis - # Note: Nginx-proxy is an external service. You can find more information about the configuration here: - # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. - # https://hub.docker.com/r/nginxproxy/nginx-proxy proxy: build: ./proxy restart: always @@ -74,8 +69,6 @@ services: networks: - proxy-tier - # Note: Letsencrypt companion is an external service. You can find more information about the configuration here: - # https://hub.docker.com/r/nginxproxy/acme-companion letsencrypt-companion: image: nginxproxy/acme-companion restart: always @@ -92,7 +85,7 @@ services: depends_on: - proxy -# self signed,outdated +# self signed # omgwtfssl: # image: paulczar/omgwtfssl # restart: "no" diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile index 6f449c7f..46fc7e26 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile @@ -1,3 +1,3 @@ -FROM nginxproxy/nginx-proxy:1.7-alpine +FROM nginxproxy/nginx-proxy:alpine COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml index 13d4a40b..fa77198a 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -1,9 +1,6 @@ services: - # Note: MariaDB is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 command: --transaction-isolation=READ-COMMITTED restart: always volumes: @@ -15,8 +12,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -37,16 +32,12 @@ services: - redis - proxy - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ web: - image: nginx:alpine-slim + build: ./web restart: always volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./web/nginx.conf:/etc/nginx/nginx.conf:ro - # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing) - nextcloud:/var/www/html:z,ro + # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing) environment: - VIRTUAL_HOST= - LETSENCRYPT_HOST= @@ -68,9 +59,6 @@ services: - db - redis - # Note: Nginx-proxy is an external service. You can find more information about the configuration here: - # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. - # https://hub.docker.com/r/nginxproxy/nginx-proxy proxy: build: ./proxy restart: always @@ -87,8 +75,6 @@ services: networks: - proxy-tier - # Note: Letsencrypt companion is an external service. You can find more information about the configuration here: - # https://hub.docker.com/r/nginxproxy/acme-companion letsencrypt-companion: image: nginxproxy/acme-companion restart: always @@ -105,7 +91,7 @@ services: depends_on: - proxy -# self signed, outdated. +# self signed # omgwtfssl: # image: paulczar/omgwtfssl # restart: "no" diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile index 6f449c7f..46fc7e26 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile @@ -1,3 +1,3 @@ -FROM nginxproxy/nginx-proxy:1.7-alpine +FROM nginxproxy/nginx-proxy:alpine COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile new file mode 100644 index 00000000..9e620aff --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml index 035359f0..2eb4f638 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -1,8 +1,5 @@ services: - # Note: PostgreSQL is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/postgres db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server image: postgres:alpine restart: always volumes: @@ -10,8 +7,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -49,9 +44,6 @@ services: - db - redis - # Note: Nginx-proxy is an external service. You can find more information about the configuration here: - # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. - # https://hub.docker.com/r/nginxproxy/nginx-proxy proxy: build: ./proxy restart: always @@ -68,8 +60,6 @@ services: networks: - proxy-tier - # Note: Letsencrypt companion is an external service. You can find more information about the configuration here: - # https://hub.docker.com/r/nginxproxy/acme-companion letsencrypt-companion: image: nginxproxy/acme-companion restart: always @@ -84,7 +74,7 @@ services: depends_on: - proxy -# self signed, outdated +# self signed # omgwtfssl: # image: paulczar/omgwtfssl # restart: "no" diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile index 6f449c7f..46fc7e26 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile @@ -1,3 +1,3 @@ -FROM nginxproxy/nginx-proxy:1.7-alpine +FROM nginxproxy/nginx-proxy:alpine COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml index 78654edd..80be65a6 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml @@ -1,8 +1,7 @@ +version: '3' + services: - # Note: PostgreSQL is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/postgres db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server image: postgres:alpine restart: always volumes: @@ -10,8 +9,6 @@ services: env_file: - db.env - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -32,16 +29,12 @@ services: - redis - proxy - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ web: - image: nginx:alpine-slim + build: ./web restart: always volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./web/nginx.conf:/etc/nginx/nginx.conf:ro - # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing) - nextcloud:/var/www/html:z,ro + # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing) environment: - VIRTUAL_HOST= - LETSENCRYPT_HOST= @@ -63,9 +56,6 @@ services: - db - redis - # Note: Nginx-proxy is an external service. You can find more information about the configuration here: - # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences. - # https://hub.docker.com/r/nginxproxy/nginx-proxy proxy: build: ./proxy restart: always @@ -82,8 +72,6 @@ services: networks: - proxy-tier - # Note: Letsencrypt companion is an external service. You can find more information about the configuration here: - # https://hub.docker.com/r/nginxproxy/acme-companion letsencrypt-companion: image: nginxproxy/acme-companion restart: always @@ -100,7 +88,7 @@ services: depends_on: - proxy -# self signed, outdated +# self signed # omgwtfssl: # image: paulczar/omgwtfssl # restart: "no" diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile index 6f449c7f..46fc7e26 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile @@ -1,3 +1,3 @@ -FROM nginxproxy/nginx-proxy:1.7-alpine +FROM nginxproxy/nginx-proxy:alpine COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile new file mode 100644 index 00000000..9e620aff --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:alpine + +COPY nginx.conf /etc/nginx/nginx.conf diff --git a/README.md b/README.md index 3be70217..7de62124 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Database: ```console $ docker run -d \ -v db:/var/lib/mysql \ -mariadb:lts +mariadb:10.11 ``` ### Additional volumes @@ -403,11 +403,8 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia ```yaml services: - # Note: MariaDB is external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 restart: always command: --transaction-isolation=READ-COMMITTED volumes: @@ -418,8 +415,6 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -456,11 +451,8 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia ```yaml services: - # Note: MariaDB is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/mariadb db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: mariadb:lts + image: mariadb:10.11 restart: always command: --transaction-isolation=READ-COMMITTED volumes: @@ -471,8 +463,6 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always @@ -491,18 +481,15 @@ services: - MYSQL_USER=nextcloud - MYSQL_HOST=db - # Note: Nginx is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/nginx/ web: - image: nginx:alpine-slim + image: nginx restart: always ports: - 8080:80 depends_on: - app volumes: - # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html - - ./nginx.conf:/etc/nginx/nginx.conf:ro + - ./nginx.conf:/etc/nginx/nginx.conf:ro volumes_from: - app @@ -527,11 +514,8 @@ Example: ```yaml services: - # Note: PostgreSQL is external service. You can find more information about the configuration here: - # https://hub.docker.com/_/postgres db: - # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server - image: postgres:alpine + image: postgres restart: always volumes: - db:/var/lib/postgresql/data @@ -543,8 +527,6 @@ services: - postgres_db - postgres_password - postgres_user - # Note: Redis is an external service. You can find more information about the configuration here: - # https://hub.docker.com/_/redis redis: image: redis:alpine restart: always