From 6dc29f2a72d19c476d131b6f48d0544b2ab7db85 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 18 Apr 2024 16:30:37 +0300 Subject: [PATCH 01/16] Update examples section according to the latest docker compose requirements. Signed-off-by: Kaloyan Nikolov --- .../{docker-compose.yml => compose.yaml} | 18 +- .../fpm/{docker-compose.yml => compose.yaml} | 22 ++- .../insecure/mariadb/fpm/web/Dockerfile | 1 + .../insecure/mariadb/fpm/web/mime.types | 99 +++++++++++ .../insecure/mariadb/fpm/web/nginx.conf | 16 +- .../{docker-compose.yml => compose.yaml} | 18 +- .../fpm/{docker-compose.yml => compose.yaml} | 20 ++- .../insecure/postgres/fpm/web/Dockerfile | 1 + .../insecure/postgres/fpm/web/mime.types | 99 +++++++++++ .../insecure/postgres/fpm/web/nginx.conf | 15 +- .../{docker-compose.yml => compose.yaml} | 40 ++++- .../fpm/{docker-compose.yml => compose.yaml} | 36 +++- .../mariadb/fpm/web/Dockerfile | 1 + .../mariadb/fpm/web/mime.types | 99 +++++++++++ .../mariadb/fpm/web/nginx.conf | 15 +- .../{docker-compose.yml => compose.yaml} | 24 ++- .../fpm/{docker-compose.yml => compose.yaml} | 30 +++- .../postgres/fpm/web/Dockerfile | 1 + .../postgres/fpm/web/mime.types | 99 +++++++++++ .../postgres/fpm/web/nginx.conf | 15 +- README.md | 154 +++++++++++------- 21 files changed, 675 insertions(+), 148 deletions(-) rename .examples/docker-compose/insecure/mariadb/apache/{docker-compose.yml => compose.yaml} (67%) rename .examples/docker-compose/insecure/mariadb/fpm/{docker-compose.yml => compose.yaml} (66%) create mode 100644 .examples/docker-compose/insecure/mariadb/fpm/web/mime.types rename .examples/docker-compose/insecure/postgres/apache/{docker-compose.yml => compose.yaml} (70%) rename .examples/docker-compose/insecure/postgres/fpm/{docker-compose.yml => compose.yaml} (68%) create mode 100644 .examples/docker-compose/insecure/postgres/fpm/web/mime.types rename .examples/docker-compose/with-nginx-proxy/mariadb/apache/{docker-compose.yml => compose.yaml} (63%) rename .examples/docker-compose/with-nginx-proxy/mariadb/fpm/{docker-compose.yml => compose.yaml} (73%) create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types rename .examples/docker-compose/with-nginx-proxy/postgres/apache/{docker-compose.yml => compose.yaml} (79%) rename .examples/docker-compose/with-nginx-proxy/postgres/fpm/{docker-compose.yml => compose.yaml} (76%) create mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml similarity index 67% rename from .examples/docker-compose/insecure/mariadb/apache/docker-compose.yml rename to .examples/docker-compose/insecure/mariadb/apache/compose.yaml index 11ff5bf9..3e35eba0 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -1,10 +1,12 @@ -version: '3' - services: db: - image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + image: mariadb:10.8.2 + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -21,6 +23,10 @@ services: app: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -37,6 +43,10 @@ services: cron: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml similarity index 66% rename from .examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml rename to .examples/docker-compose/insecure/mariadb/fpm/compose.yaml index e293a92c..d0ebb647 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -1,10 +1,12 @@ -version: '3' - services: db: - image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + image: mariadb:10.8.2 + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -21,6 +23,10 @@ services: app: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -35,6 +41,10 @@ services: web: build: ./web restart: always + logging: + driver: "json-file" + options: + max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -45,6 +55,10 @@ services: cron: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile index 9e620aff..6d370d2f 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile @@ -1,3 +1,4 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf +COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types b/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types new file mode 100644 index 00000000..0d29f05c --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + text/javascript mjs js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index 42e49a1e..e486b881 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -162,22 +162,8 @@ http { fastcgi_max_temp_file_size 0; } - # Javascript mimetype fixes for nginx - # Note: The block below should be removed, and the js|mjs section should be - # added to the block below this one. This is a temporary fix until Nginx - # upstream fixes the js mime-type - location ~* \.(?:js|mjs)$ { - types { - text/javascript js mjs; - } - default_type "text/javascript"; - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; - access_log off; - } - # Serve static files - location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { + location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; access_log off; # Optional: Don't log access to assets diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml similarity index 70% rename from .examples/docker-compose/insecure/postgres/apache/docker-compose.yml rename to .examples/docker-compose/insecure/postgres/apache/compose.yaml index 0a48bd05..120b9ec3 100644 --- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml +++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml @@ -1,9 +1,11 @@ -version: '3' - services: db: image: postgres:alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -16,12 +18,16 @@ services: app: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: - nextcloud:/var/www/html:z environment: - - POSTGRES_HOST=db + - MYSQL_HOST=db - REDIS_HOST=redis env_file: - db.env @@ -32,6 +38,10 @@ services: cron: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -41,4 +51,4 @@ services: volumes: db: - nextcloud: + nextcloud: \ No newline at end of file diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml similarity index 68% rename from .examples/docker-compose/insecure/postgres/fpm/docker-compose.yml rename to .examples/docker-compose/insecure/postgres/fpm/compose.yaml index 97343ad9..6941f4b2 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml @@ -1,11 +1,13 @@ -version: '3' - services: db: image: postgres:alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - - db:/var/lib/postgresql/data:z + - db:/var/lib/postgresql/data:Z env_file: - db.env @@ -16,6 +18,10 @@ services: app: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -30,6 +36,10 @@ services: web: build: ./web restart: always + logging: + driver: "json-file" + options: + max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -40,6 +50,10 @@ services: cron: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile index 9e620aff..6d370d2f 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile +++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile @@ -1,3 +1,4 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf +COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/mime.types b/.examples/docker-compose/insecure/postgres/fpm/web/mime.types new file mode 100644 index 00000000..0d29f05c --- /dev/null +++ b/.examples/docker-compose/insecure/postgres/fpm/web/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + text/javascript mjs js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index b1c72e5f..e486b881 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -162,21 +162,8 @@ http { fastcgi_max_temp_file_size 0; } - # Javascript mimetype fixes for nginx - # Note: The block below should be removed, and the js|mjs section should be - # added to the block below this one. This is a temporary fix until Nginx - # upstream fixes the js mime-type - location ~* \.(?:js|mjs)$ { - types { - text/javascript js mjs; - } - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; - access_log off; - } - # Serve static files - location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { + location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; access_log off; # Optional: Don't log access to assets diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml similarity index 63% rename from .examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml rename to .examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml index b88a3594..ac548efc 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -1,10 +1,12 @@ -version: '3' - services: db: - image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + image: mariadb:10.8.2 + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -21,6 +23,10 @@ services: app: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -34,6 +40,10 @@ 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 - default @@ -41,6 +51,10 @@ services: cron: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -51,15 +65,20 @@ services: proxy: build: ./proxy restart: always + # Logging to syslog, it's best when combining with fail2ban on the host. + logging: + driver: "syslog" ports: - 80:80 - 443:443 labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - - certs:/etc/nginx/certs:z,ro + - conf.d:/etc/nginx/conf.d:z + - certs:/etc/nginx/certs:ro:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z + - dhparam:/etc/nginx/dhparam:z - /var/run/docker.sock:/tmp/docker.sock:z,ro networks: - proxy-tier @@ -67,9 +86,16 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always + logging: + driver: "json-file" + options: + max-size: "50m" + environment: + - DEFAULT_EMAIL= volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -100,6 +126,8 @@ volumes: acme: vhost.d: html: + dhparam: + conf.d: networks: proxy-tier: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml similarity index 73% rename from .examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml rename to .examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml index 94196e9f..42511718 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -1,10 +1,12 @@ -version: '3' - services: db: - image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + image: mariadb:10.8.2 + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -21,6 +23,10 @@ services: app: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -31,10 +37,15 @@ services: depends_on: - db - redis + - proxy web: build: ./web restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z,ro environment: @@ -50,6 +61,10 @@ services: cron: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -60,14 +75,17 @@ services: proxy: build: ./proxy restart: always + logging: + driver: "syslog" ports: - 80:80 - 443:443 labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - certs:/etc/nginx/certs:z,ro - vhost.d:/etc/nginx/vhost.d:z + - conf.d:/etc/nginx/conf.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro networks: @@ -76,9 +94,16 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always + logging: + driver: "json-file" + options: + max-size: "50m" + environment: + - DEFAULT_EMAIL= volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -108,6 +133,7 @@ volumes: certs: acme: vhost.d: + conf.d: html: networks: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile index 9e620aff..6d370d2f 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile @@ -1,3 +1,4 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf +COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types new file mode 100644 index 00000000..0d29f05c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + text/javascript mjs js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index 01c28564..f69ddc5e 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -162,21 +162,8 @@ http { fastcgi_max_temp_file_size 0; } - # Javascript mimetype fixes for nginx - # Note: The block below should be removed, and the js|mjs section should be - # added to the block below this one. This is a temporary fix until Nginx - # upstream fixes the js mime-type - location ~* \.(?:js|mjs)$ { - types { - text/javascript js mjs; - } - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; - access_log off; - } - # Serve static files - location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { + location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; access_log off; # Optional: Don't log access to assets diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml similarity index 79% rename from .examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml rename to .examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml index 243e06cf..92b20fc8 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -1,9 +1,11 @@ -version: '3' - services: db: image: postgres:alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -16,6 +18,10 @@ services: app: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -29,6 +35,7 @@ services: depends_on: - db - redis + - proxy networks: - proxy-tier - default @@ -36,6 +43,10 @@ services: cron: image: nextcloud:apache restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -46,13 +57,16 @@ services: proxy: build: ./proxy restart: always + logging: + driver: "syslog" ports: - 80:80 - 443:443 labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - - certs:/etc/nginx/certs:z,ro + - certs:/etc/nginx/certs:ro:z + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro @@ -65,6 +79,7 @@ services: volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -94,6 +109,7 @@ volumes: certs: acme: vhost.d: + conf.d: html: networks: diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml similarity index 76% rename from .examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml rename to .examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml index 008d74af..b260511e 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml @@ -4,6 +4,10 @@ services: db: image: postgres:alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -16,6 +20,10 @@ services: app: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -26,10 +34,15 @@ services: depends_on: - db - redis + - proxy web: build: ./web restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z,ro environment: @@ -45,6 +58,10 @@ services: cron: image: nextcloud:fpm-alpine restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -55,13 +72,16 @@ services: proxy: build: ./proxy restart: always + logging: + driver: "syslog" ports: - 80:80 - 443:443 labels: - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" + - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - certs:/etc/nginx/certs:z,ro + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro @@ -71,12 +91,19 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z + - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro + environment: + - DEFAULT_EMAIL= networks: - proxy-tier depends_on: @@ -102,6 +129,7 @@ volumes: nextcloud: certs: acme: + conf.d: vhost.d: html: diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile index 9e620aff..6d370d2f 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile @@ -1,3 +1,4 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf +COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types new file mode 100644 index 00000000..0d29f05c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types @@ -0,0 +1,99 @@ + +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + text/javascript mjs js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/avif avif; + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/wasm wasm; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index 01c28564..c1e11d93 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -162,21 +162,8 @@ http { fastcgi_max_temp_file_size 0; } - # Javascript mimetype fixes for nginx - # Note: The block below should be removed, and the js|mjs section should be - # added to the block below this one. This is a temporary fix until Nginx - # upstream fixes the js mime-type - location ~* \.(?:js|mjs)$ { - types { - text/javascript js mjs; - } - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; - access_log off; - } - # Serve static files - location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { + location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; access_log off; # Optional: Don't log access to assets diff --git a/README.md b/README.md index b9f7a66d..ad4c7e2e 100644 --- a/README.md +++ b/README.md @@ -38,16 +38,16 @@ Now you can access Nextcloud at http://localhost:8080/ from your host system. ## Using the fpm image -To use the fpm image, you need an additional web server, such as [nginx](https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html), that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want to use another container or your host as proxy. If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file). In both cases you don't want to map the fpm port to your host. +To use the fpm image, you need an additional web server, such as [nginx](https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html), that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want to use another container or your host as proxy. If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker compose` file). In both cases you don't want to map the fpm port to your host. ```console $ docker run -d nextcloud:fpm ``` -As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose). +As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker compose section](#running-this-image-with-docker-compose). ## Using an external database -By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section. +By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker compose section. ## Persistent data The Nextcloud installation and all data beyond what lives in the database (file uploads, etc.) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted. @@ -109,9 +109,9 @@ To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/ ```console $ docker exec --user www-data CONTAINER_ID php occ ``` -or for docker-compose: +or for docker compose: ```console -$ docker-compose exec --user www-data app php occ +$ docker compose exec --user www-data app php occ ``` ## Auto configuration via environment variables @@ -155,7 +155,7 @@ You might want to make sure the htaccess is up to date after each container upda - `NEXTCLOUD_INIT_HTACCESS` (not set by default) Set it to true to enable run `occ maintenance:update:htaccess` after container initialization. -If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters: +If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker compose file. To inform Nextcloud about the Redis container, pass in the following parameters: - `REDIS_HOST` (not set by default) Name of Redis container - `REDIS_HOST_PORT` (default: `6379`) Optional port for Redis, only use for external Redis servers that run on non-standard ports. @@ -282,42 +282,51 @@ Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admi Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together. -# Running this image with docker-compose -The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. +# Running this image with docker compose +The easiest way to get a fully featured and functional setup is using a `docker compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information. ## Base version - apache -This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy. +This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. +> [!WARNING] +> This setup provides **no ssl encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. ```yaml -version: '2' - -volumes: - nextcloud: - db: - services: db: - image: mariadb:10.6 + image: mariadb:10.8.2 restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF volumes: - db:/var/lib/mysql + logging: + driver: "json-file" + options: + max-size: "50m" environment: - MYSQL_ROOT_PASSWORD= - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud + redis: + image: redis:alpine + restart: always + app: image: nextcloud restart: always ports: - 8080:80 - links: + logging: + driver: "json-file" + options: + max-size: "50m" + depends_on: + - redis - db volumes: - nextcloud:/var/www/html @@ -327,41 +336,52 @@ services: - MYSQL_USER=nextcloud - MYSQL_HOST=db +volumes: + nextcloud: + db: ``` -Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system. +Then run `docker compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system. ## Base version - FPM When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). -As this setup does **not include encryption**, it should be run behind a proxy. +> [!WARNING] +> This setup provides **no ssl encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. ```yaml -version: '2' - -volumes: - nextcloud: - db: - services: db: - image: mariadb:10.6 + image: mariadb:10.8.2 restart: always - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF volumes: - db:/var/lib/mysql + logging: + driver: "json-file" + options: + max-size: "50m" environment: - MYSQL_ROOT_PASSWORD= - MYSQL_PASSWORD= - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud + redis: + image: redis:alpine + restart: always + app: image: nextcloud:fpm restart: always - links: + logging: + driver: "json-file" + options: + max-size: "50m" + depends_on: + - redis - db volumes: - nextcloud:/var/www/html @@ -376,25 +396,31 @@ services: restart: always ports: - 8080:80 - links: + depends_on: - app volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro volumes_from: - app + +volumes: + nextcloud: + db: ``` -Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system. +Then run `docker compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system. # Docker Secrets As an alternative to passing sensitive information via environment variables, `_FILE` may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in `/run/secrets/` files. For example: ```yaml -version: '3.2' - services: db: image: postgres restart: always + logging: + driver: "json-file" + options: + max-size: "50m" volumes: - db:/var/lib/postgresql/data environment: @@ -405,10 +431,17 @@ services: - postgres_db - postgres_password - postgres_user + redis: + image: redis:alpine + restart: always app: image: nextcloud restart: always + logging: + driver: "json-file" + options: + max-size: "50m" ports: - 8080:80 volumes: @@ -421,6 +454,7 @@ services: - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user depends_on: + - redis - db secrets: - nextcloud_admin_password @@ -458,10 +492,10 @@ There are many different possibilities to introduce encryption depending on your We recommend using a reverse proxy in front of your Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you. -In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup. +In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/nginx-proxy/nginx-proxy) and [acme-companion](https://github.com/nginx-proxy/acme-companion) containers. Please check the according documentations before using this setup. # First use -When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file. +When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `compose.yaml` file. # Update to a newer version Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one. @@ -478,11 +512,11 @@ $ docker run -d nextcloud ``` Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping. -When using docker-compose your compose file takes care of your configuration, so you just have to run: +When using docker compose your compose file takes care of your configuration, so you just have to run: ```console -$ docker-compose pull -$ docker-compose up -d +$ docker compose pull +$ docker compose up -d ``` @@ -497,13 +531,13 @@ RUN ... ``` The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication. -If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file) +If you use your own Dockerfile, you need to configure your docker compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker compose file) ```yaml app: build: . restart: always - links: + depends_on: - db volumes: - data:/var/www/html/data @@ -531,10 +565,10 @@ docker build -t your-name --pull . docker run -d your-name ``` -or for docker-compose: +or for docker compose: ```console -docker-compose build --pull -docker-compose up -d +docker compose build --pull +docker compose up -d ``` The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image. @@ -542,19 +576,19 @@ The `--pull` option tells docker to look for new versions of the base image. The # Migrating an existing installation You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for: -1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there. -2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container) +1. Define your whole Nextcloud infrastructure in a `docker compose` file and run it with `docker compose up -d` to get the base installation, volumes and database. Work from there. +2. Restore your database from a mysqldump (db is the name of your database container) - To import from a MySQL dump use the following commands ```console - docker cp ./database.dmp nextcloud_db_1:/dmp - docker-compose exec db sh -c "mysql --user USER --password PASSWORD nextcloud < /dmp" - docker-compose exec db rm /dmp + docker compose cp ./database.dmp db:/dmp + docker compose exec db sh -c "mysql --user USER --password PASSWORD nextcloud < /dmp" + docker compose exec db rm /dmp ``` - To import from a PostgreSQL dump use to following commands ```console - docker cp ./database.dmp nextcloud_db_1:/dmp - docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp" - docker-compose exec db rm /dmp + docker compose cp ./database.dmp db:/dmp + docker compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp" + docker compose exec db rm /dmp ``` 3. Edit your config.php 1. Set database connection @@ -595,14 +629,14 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ```php 'datadirectory' => '/var/www/html/data', ``` -4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container): +4. Copy your data (`app` is the name of your Nextcloud container): ```console - docker cp ./data/ nextcloud_app_1:/var/www/html/ - docker-compose exec app chown -R www-data:www-data /var/www/html/data - docker cp ./theming/ nextcloud_app_1:/var/www/html/ - docker-compose exec app chown -R www-data:www-data /var/www/html/theming - docker cp ./config/config.php nextcloud_app_1:/var/www/html/config - docker-compose exec app chown -R www-data:www-data /var/www/html/config + docker compose cp ./data/ app:/var/www/html/ + docker compose exec app chown -R www-data:www-data /var/www/html/data + docker compose cp ./theming/ app:/var/www/html/ + docker compose exec app chown -R www-data:www-data /var/www/html/theming + docker compose cp ./config/config.php napp:/var/www/html/config + docker compose exec app chown -R www-data:www-data /var/www/html/config ``` If you want to preserve the metadata of your files like timestamps, copy the data directly on the host to the named volume using plain `cp` like this: ```console @@ -610,8 +644,8 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ``` 5. Copy only the custom apps you use (or simply redownload them from the web interface): ```console - docker cp ./custom_apps/ nextcloud_data:/var/www/html/ - docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps + docker compose cp ./custom_apps/ nextcloud_data:/var/www/html/ + docker compose exec app chown -R www-data:www-data /var/www/html/custom_apps ``` # Help (Questions / Issues) From f4d89ecb292f8c0ece5268c1e9f9d28bbb826089 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 18 Apr 2024 16:53:52 +0300 Subject: [PATCH 02/16] Minor readme updates to match the changes for the compose v2 syntax. Signed-off-by: Kaloyan Nikolov --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ad4c7e2e..3a9d679f 100644 --- a/README.md +++ b/README.md @@ -283,7 +283,7 @@ Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admi Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together. # Running this image with docker compose -The easiest way to get a fully featured and functional setup is using a `docker compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. +The easiest way to get a fully featured and functional setup is using a docker `compose.yaml` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information. @@ -344,7 +344,7 @@ volumes: Then run `docker compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system. ## Base version - FPM -When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). +When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). > [!WARNING] > This setup provides **no ssl encryption** and is intended to run behind a proxy. @@ -531,7 +531,7 @@ RUN ... ``` The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication. -If you use your own Dockerfile, you need to configure your docker compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker compose file) +If you use your own Dockerfile, you need to configure your docker compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker `compose.yaml` file) ```yaml app: @@ -576,8 +576,8 @@ The `--pull` option tells docker to look for new versions of the base image. The # Migrating an existing installation You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for: -1. Define your whole Nextcloud infrastructure in a `docker compose` file and run it with `docker compose up -d` to get the base installation, volumes and database. Work from there. -2. Restore your database from a mysqldump (db is the name of your database container) +1. Define your whole Nextcloud infrastructure in a docker `compose.yaml` file and run it with `docker compose up -d` to get the base installation, volumes and database. Work from there. +2. Restore your database from a mysqldump (db is the name of your database container / service name) - To import from a MySQL dump use the following commands ```console docker compose cp ./database.dmp db:/dmp @@ -629,7 +629,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ```php 'datadirectory' => '/var/www/html/data', ``` -4. Copy your data (`app` is the name of your Nextcloud container): +4. Copy your data (`app` is the name of your Nextcloud container / service name): ```console docker compose cp ./data/ app:/var/www/html/ docker compose exec app chown -R www-data:www-data /var/www/html/data @@ -644,7 +644,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som ``` 5. Copy only the custom apps you use (or simply redownload them from the web interface): ```console - docker compose cp ./custom_apps/ nextcloud_data:/var/www/html/ + docker compose cp ./custom_apps/ app:/var/www/html/ docker compose exec app chown -R www-data:www-data /var/www/html/custom_apps ``` From ee6e17785d9d818b1242b598e62dd51b34f711e8 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 18 Apr 2024 17:25:37 +0300 Subject: [PATCH 03/16] Fix wrong environment variable Signed-off-by: Kaloyan Nikolov --- .examples/docker-compose/insecure/postgres/apache/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.examples/docker-compose/insecure/postgres/apache/compose.yaml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml index 120b9ec3..6302890b 100644 --- a/.examples/docker-compose/insecure/postgres/apache/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml @@ -27,7 +27,7 @@ services: volumes: - nextcloud:/var/www/html:z environment: - - MYSQL_HOST=db + - POSTGRES_HOST=db - REDIS_HOST=redis env_file: - db.env From 4b9c57d1e469b00674bc8b075dc2bcce2979395c Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 18 Apr 2024 18:33:39 +0300 Subject: [PATCH 04/16] Add missing headers to fpm config Signed-off-by: Kaloyan Nikolov --- .../docker-compose/insecure/mariadb/fpm/web/nginx.conf | 6 ++++++ .../docker-compose/insecure/postgres/fpm/web/nginx.conf | 6 ++++++ .../with-nginx-proxy/mariadb/fpm/web/nginx.conf | 6 ++++++ .../with-nginx-proxy/postgres/fpm/web/nginx.conf | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index e486b881..c7dcbc95 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -166,6 +166,12 @@ http { location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index e486b881..c7dcbc95 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -166,6 +166,12 @@ http { location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index f69ddc5e..f574bde0 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -166,6 +166,12 @@ http { location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index c1e11d93..dccb37f6 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -166,6 +166,12 @@ http { location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Referrer-Policy "no-referrer" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Permitted-Cross-Domain-Policies "none" always; + add_header X-Robots-Tag "noindex, nofollow" always; + add_header X-XSS-Protection "1; mode=block" always; access_log off; # Optional: Don't log access to assets location ~ \.wasm$ { From bd456a2ab1ed348ad22f4639a4fd3dfb84647389 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 18 Apr 2024 18:52:27 +0300 Subject: [PATCH 05/16] Fix cache control Signed-off-by: Kaloyan Nikolov --- .examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf | 4 ++-- .examples/docker-compose/insecure/postgres/fpm/web/nginx.conf | 4 ++-- .../with-nginx-proxy/mariadb/fpm/web/nginx.conf | 4 ++-- .../with-nginx-proxy/postgres/fpm/web/nginx.conf | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index c7dcbc95..1f8e22e8 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -30,7 +30,7 @@ http { # Set the `immutable` cache control options only for assets with a cache busting `v` argument map $arg_v $asset_immutable { "" ""; - default "immutable"; + default ", immutable"; } #gzip on; @@ -165,7 +165,7 @@ http { # Serve static files location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Cache-Control "public, max-age=15778463$asset_immutable"; add_header Referrer-Policy "no-referrer" always; add_header X-Content-Type-Options "nosniff" always; add_header X-Frame-Options "SAMEORIGIN" always; diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index c7dcbc95..1f8e22e8 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -30,7 +30,7 @@ http { # Set the `immutable` cache control options only for assets with a cache busting `v` argument map $arg_v $asset_immutable { "" ""; - default "immutable"; + default ", immutable"; } #gzip on; @@ -165,7 +165,7 @@ http { # Serve static files location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Cache-Control "public, max-age=15778463$asset_immutable"; add_header Referrer-Policy "no-referrer" always; add_header X-Content-Type-Options "nosniff" always; add_header X-Frame-Options "SAMEORIGIN" always; diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index f574bde0..c2d12c5c 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -30,7 +30,7 @@ http { # Set the `immutable` cache control options only for assets with a cache busting `v` argument map $arg_v $asset_immutable { "" ""; - default "immutable"; + default ", immutable"; } #gzip on; @@ -165,7 +165,7 @@ http { # Serve static files location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Cache-Control "public, max-age=15778463$asset_immutable"; add_header Referrer-Policy "no-referrer" always; add_header X-Content-Type-Options "nosniff" always; add_header X-Frame-Options "SAMEORIGIN" always; diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index dccb37f6..ba8e7322 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -30,7 +30,7 @@ http { # Set the `immutable` cache control options only for assets with a cache busting `v` argument map $arg_v $asset_immutable { "" ""; - default "immutable"; + default ", immutable"; } #gzip on; @@ -165,7 +165,7 @@ http { # Serve static files location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ { try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463, $asset_immutable"; + add_header Cache-Control "public, max-age=15778463$asset_immutable"; add_header Referrer-Policy "no-referrer" always; add_header X-Content-Type-Options "nosniff" always; add_header X-Frame-Options "SAMEORIGIN" always; From 2d439a2b6dc8f3176dd18737d40c13a735d8caa9 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 25 Apr 2024 17:38:13 +0300 Subject: [PATCH 06/16] Add mjs file extension in a proper way. Signed-off-by: Kaloyan Nikolov --- .../insecure/mariadb/fpm/web/Dockerfile | 1 - .../insecure/mariadb/fpm/web/mime.types | 99 ------------------- .../insecure/mariadb/fpm/web/nginx.conf | 3 + .../insecure/postgres/fpm/web/Dockerfile | 1 - .../insecure/postgres/fpm/web/mime.types | 99 ------------------- .../insecure/postgres/fpm/web/nginx.conf | 3 + .../mariadb/fpm/web/Dockerfile | 1 - .../mariadb/fpm/web/mime.types | 99 ------------------- .../mariadb/fpm/web/nginx.conf | 3 + .../postgres/fpm/web/Dockerfile | 1 - .../postgres/fpm/web/mime.types | 99 ------------------- .../postgres/fpm/web/nginx.conf | 3 + 12 files changed, 12 insertions(+), 400 deletions(-) delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/web/mime.types delete mode 100644 .examples/docker-compose/insecure/postgres/fpm/web/mime.types delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile index 6d370d2f..9e620aff 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile @@ -1,4 +1,3 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf -COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types b/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types deleted file mode 100644 index 0d29f05c..00000000 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/mime.types +++ /dev/null @@ -1,99 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - text/javascript mjs js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index 1f8e22e8..5dff3389 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -12,6 +12,9 @@ events { http { include mime.types; default_type application/octet-stream; + types { + text/javascript mjs; + } log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile index 6d370d2f..9e620aff 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile +++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile @@ -1,4 +1,3 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf -COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/mime.types b/.examples/docker-compose/insecure/postgres/fpm/web/mime.types deleted file mode 100644 index 0d29f05c..00000000 --- a/.examples/docker-compose/insecure/postgres/fpm/web/mime.types +++ /dev/null @@ -1,99 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - text/javascript mjs js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index 1f8e22e8..5dff3389 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -12,6 +12,9 @@ events { http { include mime.types; default_type application/octet-stream; + types { + text/javascript mjs; + } log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile index 6d370d2f..9e620aff 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile @@ -1,4 +1,3 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf -COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types deleted file mode 100644 index 0d29f05c..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/mime.types +++ /dev/null @@ -1,99 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - text/javascript mjs js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index c2d12c5c..02215270 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -12,6 +12,9 @@ events { http { include mime.types; default_type application/octet-stream; + types { + text/javascript mjs; + } log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile index 6d370d2f..9e620aff 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile @@ -1,4 +1,3 @@ FROM nginx:alpine COPY nginx.conf /etc/nginx/nginx.conf -COPY mime.types /etc/nginx/mime.types diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types deleted file mode 100644 index 0d29f05c..00000000 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/mime.types +++ /dev/null @@ -1,99 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - text/javascript mjs js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/avif avif; - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/wasm wasm; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index ba8e7322..d7d29c68 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -12,6 +12,9 @@ events { http { include mime.types; default_type application/octet-stream; + types { + text/javascript mjs; + } log_format main '$remote_addr - $remote_user [$time_local] "$request" ' '$status $body_bytes_sent "$http_referer" ' From c90aee5f6cb8145562e2b673cb2f27e5a389f6c8 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 25 Apr 2024 17:46:07 +0300 Subject: [PATCH 07/16] Typos fixed, minor clarification changes Signed-off-by: Kaloyan Nikolov --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3a9d679f..c1f0e55e 100644 --- a/README.md +++ b/README.md @@ -283,14 +283,14 @@ Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admi Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together. # Running this image with docker compose -The easiest way to get a fully featured and functional setup is using a docker `compose.yaml` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. +The easiest way to get a fully featured and functional setup is using a `compose.yaml` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for. At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information. ## Base version - apache -This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. +This version will use the apache variant and add a MariaDB container. The volumes are set to keep your data persistent. > [!WARNING] -> This setup provides **no ssl encryption** and is intended to run behind a proxy. +> This setup provides **no TLS encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. @@ -347,7 +347,7 @@ Then run `docker compose up -d`, now you can access Nextcloud at http://localhos When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). > [!WARNING] -> This setup provides **no ssl encryption** and is intended to run behind a proxy. +> This setup provides **no TLS encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. @@ -531,7 +531,7 @@ RUN ... ``` The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication. -If you use your own Dockerfile, you need to configure your docker compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker `compose.yaml` file) +If you use your own Dockerfile, you need to configure your docker compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the `compose.yaml` file) ```yaml app: @@ -576,7 +576,7 @@ The `--pull` option tells docker to look for new versions of the base image. The # Migrating an existing installation You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for: -1. Define your whole Nextcloud infrastructure in a docker `compose.yaml` file and run it with `docker compose up -d` to get the base installation, volumes and database. Work from there. +1. Define your whole Nextcloud infrastructure in a `compose.yaml` file and run it with `docker compose up -d` to get the base installation, volumes and database. Work from there. 2. Restore your database from a mysqldump (db is the name of your database container / service name) - To import from a MySQL dump use the following commands ```console @@ -635,7 +635,7 @@ You're already using Nextcloud and want to switch to docker? Great! Here are som docker compose exec app chown -R www-data:www-data /var/www/html/data docker compose cp ./theming/ app:/var/www/html/ docker compose exec app chown -R www-data:www-data /var/www/html/theming - docker compose cp ./config/config.php napp:/var/www/html/config + docker compose cp ./config/config.php app:/var/www/html/config docker compose exec app chown -R www-data:www-data /var/www/html/config ``` If you want to preserve the metadata of your files like timestamps, copy the data directly on the host to the named volume using plain `cp` like this: From d2edd7df497613e78e978f75a5fa9449d8114364 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 25 Apr 2024 17:52:56 +0300 Subject: [PATCH 08/16] Removed logging from compose files. Signed-off-by: Kaloyan Nikolov --- .../insecure/mariadb/apache/compose.yaml | 12 ---------- .../insecure/mariadb/fpm/compose.yaml | 16 -------------- .../insecure/postgres/apache/compose.yaml | 12 ---------- .../insecure/postgres/fpm/compose.yaml | 16 -------------- .../mariadb/apache/compose.yaml | 19 ---------------- .../with-nginx-proxy/mariadb/fpm/compose.yaml | 22 ------------------- .../postgres/apache/compose.yaml | 14 ------------ .../postgres/fpm/compose.yaml | 22 ------------------- 8 files changed, 133 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index 3e35eba0..79cc6096 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -3,10 +3,6 @@ services: image: mariadb:10.8.2 command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -23,10 +19,6 @@ services: app: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -43,10 +35,6 @@ services: cron: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index d0ebb647..103afad9 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -3,10 +3,6 @@ services: image: mariadb:10.8.2 command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -23,10 +19,6 @@ services: app: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -41,10 +33,6 @@ services: web: build: ./web restart: always - logging: - driver: "json-file" - options: - max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -55,10 +43,6 @@ services: cron: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/postgres/apache/compose.yaml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml index 6302890b..646261d0 100644 --- a/.examples/docker-compose/insecure/postgres/apache/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml @@ -2,10 +2,6 @@ services: db: image: postgres:alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -18,10 +14,6 @@ services: app: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -38,10 +30,6 @@ services: cron: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh diff --git a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml index 6941f4b2..b5071d5c 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml @@ -2,10 +2,6 @@ services: db: image: postgres:alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -18,10 +14,6 @@ services: app: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -36,10 +28,6 @@ services: web: build: ./web restart: always - logging: - driver: "json-file" - options: - max-size: "50m" ports: - 127.0.0.1:8080:80 volumes: @@ -50,10 +38,6 @@ services: cron: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh 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 ac548efc..3587bbd2 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -3,10 +3,6 @@ services: image: mariadb:10.8.2 command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -23,10 +19,6 @@ services: app: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -51,10 +43,6 @@ services: cron: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -65,9 +53,6 @@ services: proxy: build: ./proxy restart: always - # Logging to syslog, it's best when combining with fail2ban on the host. - logging: - driver: "syslog" ports: - 80:80 - 443:443 @@ -86,10 +71,6 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always - logging: - driver: "json-file" - options: - max-size: "50m" environment: - DEFAULT_EMAIL= volumes: 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 42511718..6d22546b 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -3,10 +3,6 @@ services: image: mariadb:10.8.2 command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/mysql:Z environment: @@ -23,10 +19,6 @@ services: app: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -42,10 +34,6 @@ services: web: build: ./web restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z,ro environment: @@ -61,10 +49,6 @@ services: cron: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -75,8 +59,6 @@ services: proxy: build: ./proxy restart: always - logging: - driver: "syslog" ports: - 80:80 - 443:443 @@ -94,10 +76,6 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always - logging: - driver: "json-file" - options: - max-size: "50m" environment: - DEFAULT_EMAIL= volumes: 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 92b20fc8..ddee8594 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -2,10 +2,6 @@ services: db: image: postgres:alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -18,10 +14,6 @@ services: app: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -43,10 +35,6 @@ services: cron: image: nextcloud:apache restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -57,8 +45,6 @@ services: proxy: build: ./proxy restart: always - logging: - driver: "syslog" ports: - 80:80 - 443:443 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 b260511e..de199d95 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml @@ -4,10 +4,6 @@ services: db: image: postgres:alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - db:/var/lib/postgresql/data:Z env_file: @@ -20,10 +16,6 @@ services: app: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z environment: @@ -39,10 +31,6 @@ services: web: build: ./web restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z,ro environment: @@ -58,10 +46,6 @@ services: cron: image: nextcloud:fpm-alpine restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - nextcloud:/var/www/html:z entrypoint: /cron.sh @@ -72,8 +56,6 @@ services: proxy: build: ./proxy restart: always - logging: - driver: "syslog" ports: - 80:80 - 443:443 @@ -91,10 +73,6 @@ services: letsencrypt-companion: image: nginxproxy/acme-companion restart: always - logging: - driver: "json-file" - options: - max-size: "50m" volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z From e87ce110f30cb80522c976ddbb88454b4b054887 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 25 Apr 2024 17:59:02 +0300 Subject: [PATCH 09/16] Restored MariaDB to 10.6 as per docs suggestions Signed-off-by: Kaloyan Nikolov --- .examples/docker-compose/insecure/mariadb/apache/compose.yaml | 4 ++-- .examples/docker-compose/insecure/mariadb/fpm/compose.yaml | 4 ++-- .../with-nginx-proxy/mariadb/apache/compose.yaml | 4 ++-- .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index 79cc6096..775c35ef 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: - image: mariadb:10.8.2 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + image: mariadb:10.6 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index 103afad9..846cdaa3 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: - image: mariadb:10.8.2 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + image: mariadb:10.6 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z 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 3587bbd2..ffcc5779 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: - image: mariadb:10.8.2 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + image: mariadb:10.6 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z 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 6d22546b..de79bd6b 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: - image: mariadb:10.8.2 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + image: mariadb:10.6 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z From cbcbeea070396d4fed4584d9abc0bf3e5d7ad1a4 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 25 Apr 2024 18:03:56 +0300 Subject: [PATCH 10/16] Remove extra nginx volume Signed-off-by: Kaloyan Nikolov --- .../with-nginx-proxy/mariadb/apache/compose.yaml | 3 --- .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml | 3 --- .../with-nginx-proxy/postgres/apache/compose.yaml | 3 --- .../docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml | 3 --- 4 files changed, 12 deletions(-) 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 ffcc5779..1f982005 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -59,7 +59,6 @@ services: labels: - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - - conf.d:/etc/nginx/conf.d:z - certs:/etc/nginx/certs:ro:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z @@ -76,7 +75,6 @@ services: volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -108,7 +106,6 @@ volumes: vhost.d: html: dhparam: - conf.d: networks: proxy-tier: 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 de79bd6b..863d0ac4 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -67,7 +67,6 @@ services: volumes: - certs:/etc/nginx/certs:z,ro - vhost.d:/etc/nginx/vhost.d:z - - conf.d:/etc/nginx/conf.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro networks: @@ -81,7 +80,6 @@ services: volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -111,7 +109,6 @@ volumes: certs: acme: vhost.d: - conf.d: html: networks: 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 ddee8594..43393063 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -52,7 +52,6 @@ services: - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - certs:/etc/nginx/certs:ro:z - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro @@ -65,7 +64,6 @@ services: volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -95,7 +93,6 @@ volumes: certs: acme: vhost.d: - conf.d: html: networks: 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 de199d95..09a80e7d 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml @@ -63,7 +63,6 @@ services: - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - certs:/etc/nginx/certs:z,ro - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro @@ -76,7 +75,6 @@ services: volumes: - certs:/etc/nginx/certs:z - acme:/etc/acme.sh:z - - conf.d:/etc/nginx/conf.d:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/var/run/docker.sock:z,ro @@ -107,7 +105,6 @@ volumes: nextcloud: certs: acme: - conf.d: vhost.d: html: From a39742175eeafe0b1418f926e6b40bdaaa72b33a Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 16 May 2024 12:01:11 +0300 Subject: [PATCH 11/16] Removed GH specific markdown from Readme, change mariadb to recommended version Signed-off-by: Kaloyan Nikolov --- README.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c1f0e55e..b33540a5 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,7 @@ If mounting additional volumes under `/var/www/html`, you should consider: - Confirming that [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude) contains the files and folders that should persist during installation and upgrades; or - Mounting storage volumes to locations outside of `/var/www/html`. -> [!WARNING] -> You should note that data inside the main folder (`/var/www/html`) will be overridden/removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` and if possible read-only so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). +You should note that data inside the main folder (`/var/www/html`) will be overridden/removed during installation and upgrades, unless listed in [upgrade.exclude](https://github.com/nextcloud/docker/blob/master/upgrade.exclude). The additional volumes officially supported are already in that list, but custom volumes will need to be added by you. We suggest mounting custom storage volumes outside of `/var/www/html` and if possible read-only so that making this adjustment is unnecessary. If you must do so, however, you may build a custom image with a modified `/upgrade.exclude` file that incorporates your custom volume(s). ## Using the Nextcloud command-line interface @@ -288,16 +287,14 @@ The easiest way to get a fully featured and functional setup is using a `compose At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information. ## Base version - apache -This version will use the apache variant and add a MariaDB container. The volumes are set to keep your data persistent. -> [!WARNING] -> This setup provides **no TLS encryption** and is intended to run behind a proxy. +This version will use the apache variant and add a MariaDB container. The volumes are set to keep your data persistent. This setup provides **no TLS encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. ```yaml services: db: - image: mariadb:10.8.2 + image: mariadb:10.6 restart: always command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF volumes: @@ -346,15 +343,14 @@ Then run `docker compose up -d`, now you can access Nextcloud at http://localhos ## Base version - FPM When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). -> [!WARNING] -> This setup provides **no TLS encryption** and is intended to run behind a proxy. +This setup provides **no TLS encryption** and is intended to run behind a proxy. Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup. ```yaml services: db: - image: mariadb:10.8.2 + image: mariadb:10.6 restart: always command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF volumes: From 326ed478480a69918b3fba41278890fd9823c814 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 16 May 2024 12:11:19 +0300 Subject: [PATCH 12/16] typo Signed-off-by: Kaloyan Nikolov --- .../docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f982005..98f2ec46 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -59,7 +59,7 @@ services: labels: - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - - certs:/etc/nginx/certs:ro:z + - certs:/etc/nginx/certs:ro,z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - dhparam:/etc/nginx/dhparam:z From f87e26d3550fdbfcb5b6b9a104526e4fae0b321e Mon Sep 17 00:00:00 2001 From: J0WI Date: Wed, 18 Sep 2024 20:04:16 +0000 Subject: [PATCH 13/16] Update .examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml Signed-off-by: J0WI --- .../with-nginx-proxy/postgres/apache/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 43393063..a3dece4b 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -51,7 +51,7 @@ services: labels: - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy" volumes: - - certs:/etc/nginx/certs:ro:z + - certs:/etc/nginx/certs:ro,z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - /var/run/docker.sock:/tmp/docker.sock:z,ro From 3fb5f13b2e51bc1affd5971f0065be308910fef0 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Thu, 19 Sep 2024 00:32:32 +0300 Subject: [PATCH 14/16] Update to correct MariaDB command Signed-off-by: Kaloyan Nikolov --- .examples/docker-compose/insecure/mariadb/apache/compose.yaml | 2 +- .examples/docker-compose/insecure/mariadb/fpm/compose.yaml | 2 +- .../docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml | 2 +- .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index 775c35ef..234ecd87 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index 846cdaa3..c41cab37 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always volumes: - db:/var/lib/mysql:Z 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 98f2ec46..7327895f 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always volumes: - db:/var/lib/mysql:Z 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 863d0ac4..fa5a27bc 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF restart: always volumes: - db:/var/lib/mysql:Z From 3b01457a9be4daec1d4a5c05d7dcd93b60dbe6d9 Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Mon, 23 Sep 2024 09:46:38 +0300 Subject: [PATCH 15/16] Updated compose files for mariadb to match current docs Signed-off-by: Kaloyan Nikolov --- .examples/docker-compose/insecure/mariadb/apache/compose.yaml | 2 +- .examples/docker-compose/insecure/mariadb/fpm/compose.yaml | 2 +- .../with-nginx-proxy/mariadb/apache/compose.yaml | 2 +- .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml | 2 +- README.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index 234ecd87..c2132842 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index c41cab37..90fae9a5 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z 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 7327895f..91dfdb80 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z 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 fa5a27bc..e4379b2b 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -1,7 +1,7 @@ services: db: image: mariadb:10.6 - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/README.md b/README.md index b33540a5..ae12a30b 100644 --- a/README.md +++ b/README.md @@ -296,7 +296,7 @@ services: db: image: mariadb:10.6 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW volumes: - db:/var/lib/mysql logging: @@ -352,7 +352,7 @@ services: db: image: mariadb:10.6 restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-read-only-compressed=OFF + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW volumes: - db:/var/lib/mysql logging: From 57e228285ab42c7d6f96247b12b11ea84c826d7f Mon Sep 17 00:00:00 2001 From: Kaloyan Nikolov Date: Mon, 23 Sep 2024 09:47:52 +0300 Subject: [PATCH 16/16] Update outdated docker-compose command in Readme Signed-off-by: Kaloyan Nikolov --- .examples/README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.examples/README.md b/.examples/README.md index 64b694b5..7e3903c1 100644 --- a/.examples/README.md +++ b/.examples/README.md @@ -66,9 +66,9 @@ The following Dockerfile commands are also necessary for a sucessfull cron insta ## docker-compose In `docker-compose` additional services are bundled to create a complete nextcloud installation. The examples are designed to run out-of-the-box. -Before running the examples you have to modify the `db.env` and `docker-compose.yml` file and fill in your custom information. +Before running the examples you have to modify the `db.env` and `compose.yaml` file and fill in your custom information. -The docker-compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker-compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `docker-compose.yml` file. +The docker-compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `compose.yaml` file. ### insecure @@ -78,10 +78,10 @@ For this use one of the [with-nginx-proxy](#with-nginx-proxy) examples. To use this example complete the following steps: -1. if you use mariadb or mysql choose a root password for the database in `docker-compose.yml` behind `MYSQL_ROOT_PASSWORD=` +1. if you use mariadb or mysql choose a root password for the database in `compose.yaml` behind `MYSQL_ROOT_PASSWORD=` 2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres) -3. run `docker-compose build --pull` to pull the most recent base images and build the custom dockerfiles -4. start nextcloud with `docker-compose up -d` +3. run `docker compose build --pull` to pull the most recent base images and build the custom dockerfiles +4. start nextcloud with `docker compose up -d` If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4. @@ -97,13 +97,13 @@ This combination of the [nginxproxy/nginx-proxy](https://github.com/nginx-proxy/ To use this example complete the following steps: -1. open `docker-compose.yml` +1. open `compose.yaml` 1. insert your nextcloud domain behind `VIRTUAL_HOST=`and `LETSENCRYPT_HOST=` 2. enter a valid email behind `LETSENCRYPT_EMAIL=` 3. if you use mariadb or mysql choose a root password for the database behind `MYSQL_ROOT_PASSWORD=` 2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres) -3. run `docker-compose build --pull` to pull the most recent base images and build the custom dockerfiles -4. start nextcloud with `docker-compose up -d` +3. run `docker compose build --pull` to pull the most recent base images and build the custom dockerfiles +4. start nextcloud with `docker compose up -d` If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4.