Merge f7c1135466 into d1dbc77e0b

.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env

@@ -1,3 +1,16 @@
 POSTGRES_PASSWORD=
-POSTGRES_DB=nextcloud
+POSTGRES_DB=
-POSTGRES_USER=nextcloud
+POSTGRES_USER=
+NEXTCLOUD_ADMIN_USER=
+NEXTCLOUD_ADMIN_PASSWORD=
+OVERWRITECLIURL=
+OVERWRITEPROTOCOL=https
+NEXTCLOUD_TRUSTED_DOMAINS=  # separate each one by space
+OVERWRITEHOST=
+NEXTCLOUD_TRUSTED_PROXIES=192.168.112.0/24
+TZ=Europe/Prague
+PHP_MEMORY_LIMIT=1024M
+PHP_UPLOAD_LIMIT=20G
+upload_max_filesize=20G
+pm.max_children=80
+max_execution_time=3600

.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml

@@ -5,39 +5,71 @@ services:
     image: postgres:alpine
     restart: always
     volumes:
-      - db:/var/lib/postgresql/data:Z
+      - /apps/ncapache/db:/var/lib/postgresql/data:Z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
     env_file:
       - db.env
 
   redis:
     image: redis:alpine
     restart: always
+    sysctls:
+      - net.core.somaxconn=65535
+    volumes:
+      - /Serie/apps/ncapache/redis-data:/data:Z
+#      - /etc/localtime:/etc/localtime:ro
+#      - /etc/timezone:/etc/timezone:ro
 
   app:
-    image: nextcloud:apache
+    image: toffo1nextcloud:apache
+#    build: ./fpm
     restart: always
     volumes:
-      - nextcloud:/var/www/html:z
+      - /apps/ncapache/html:/var/www/html:z
+      - /apps/ncapache/config:/var/www/html/config:z
+      - /apps/ncapache/data:/var/www/html/data:z
+      - /Serie:/mnt/!!Series:z
+#      - /Serie/apps/nc_test/nextcloud/upload_tmp_dir:/tmp/nextcloudtemp:z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
     environment:
-      - VIRTUAL_HOST=
-      - LETSENCRYPT_HOST=
-      - LETSENCRYPT_EMAIL=
       - POSTGRES_HOST=db
+      - OVERWRITECLIURL=https://toffo.pilsfree.net
+      - OVERWRITEPROTOCOL=https
+      - NEXTCLOUD_TRUSTED_DOMAINS=toffo.pilsfree.net toffo.pilsfre.cz 192.168.200.200
+      - OVERWRITEHOST=toffo.pilsfree.net
+      - nextcloud_default_phone_region=CZ
       - REDIS_HOST=redis
+      - NEXTCLOUD_TRUSTED_PROXIES=192.168.112.0/24
+      - VIRTUAL_HOST=toffo.pilsfree.net
+      - LETSENCRYPT_HOST=toffo.pilsfree.net
+      - LETSENCRYPT_EMAIL=toffo@pilsfree.net
+#      - UPLOAD_TMP_DIR=/tmp/nextcloudtemp
+#      - NEXTCLOUD_INIT_HTACCESS=true
+#      - NEXTCLOUD_UPDATE=1
+    devices:
+      - /dev/dri:/dev/dri
     env_file:
       - db.env
     depends_on:
       - db
       - redis
+#      - cron
     networks:
       - proxy-tier
       - default
 
   cron:
-    image: nextcloud:apache
+    image: toffo1nextcloud:apache
     restart: always
     volumes:
-      - nextcloud:/var/www/html:z
+      - /apps/ncapache/html:/var/www/html:z
+      - /apps/ncapache/config:/var/www/html/config:z
+      - /apps/ncapache/data:/var/www/html/data:z
+#      - /Serie/apps/nc_test/nextcloud/upload_tmp_dir:/tmp/nextcloudtemp:z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
     entrypoint: /cron.sh
     depends_on:
       - db
@@ -52,10 +84,12 @@ services:
     labels:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
-      - certs:/etc/nginx/certs:z,ro
+      - /apps/ncapache/certs:/etc/nginx/certs:z,ro
-      - vhost.d:/etc/nginx/vhost.d:z
+      - /apps/ncapache/vhost.d:/etc/nginx/vhost.d:z
-      - html:/usr/share/nginx/html:z
+      - /apps/ncapache/html:/usr/share/nginx/html:z
       - /var/run/docker.sock:/tmp/docker.sock:z,ro
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
     networks:
       - proxy-tier
 
@@ -63,38 +97,24 @@ services:
     image: nginxproxy/acme-companion
     restart: always
     volumes:
-      - certs:/etc/nginx/certs:z
+      - /apps/ncapache/certs:/etc/nginx/certs:z
-      - acme:/etc/acme.sh:z
+      - /apps/ncapache/acme:/etc/acme.sh:z
-      - vhost.d:/etc/nginx/vhost.d:z
+      - /apps/ncapache/vhost.d:/etc/nginx/vhost.d:z
-      - html:/usr/share/nginx/html:z
+      - /apps/ncapache/html:/usr/share/nginx/html:z
       - /var/run/docker.sock:/var/run/docker.sock:z,ro
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
     networks:
       - proxy-tier
     depends_on:
       - proxy
 
-# self signed
-#  omgwtfssl:
-#    image: paulczar/omgwtfssl
-#    restart: "no"
-#    volumes:
-#      - certs:/certs
-#    environment:
-#      - SSL_SUBJECT=servhostname.local
-#      - CA_SUBJECT=my@example.com
-#      - SSL_KEY=/certs/servhostname.local.key
-#      - SSL_CSR=/certs/servhostname.local.csr
-#      - SSL_CERT=/certs/servhostname.local.crt
-#    networks:
-#      - proxy-tier
-
-volumes:
-  db:
-  nextcloud:
-  certs:
-  acme:
-  vhost.d:
-  html:
-
 networks:
+# - net.ipv6.conf.all.disable_ipv6=1
   proxy-tier:
+    name: proxy-tier
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 192.168.112.0/24
+          gateway: 192.168.112.1

.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/uploadsize.conf

@@ -1,2 +1,3 @@
-client_max_body_size 10G;
+client_max_body_size 0;
 proxy_request_buffering off;
+proxy_max_temp_file_size 0;

fpmalpinetoffo/Dockerfile

@@ -0,0 +1,50 @@
+FROM nextcloud/nextcloudtoffo:fpm-alpine
+#WORKDIR /usr/src/app
+RUN \
+    echo "@main http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_MIN_VERSION}/main" >> /etc/apk/reposito
+    echo "@community http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_MIN_VERSION}/community" >> /etc/ap
+    echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
+RUN apk add --no-cache \
+      rsync \
+      bash \
+      curl \
+      libgcc \
+      lksctp-tools \
+      pcre \
+      zlib-dev \
+      dpkg-dev \
+      dpkg \
+      gcc \
+      g++ \
+      libc-dev \
+      linux-headers \....
+      tar \
+      gcompat \
+      libucontext \
+      musl-obstack \
+      libva-vdpau-driver \
+      libvdpau \
+      libx11 \
+      nodejs \
+      ghostscript \
+      libbz2 \
+      zlib \
+      musl \
+      mesa-dri-gallium \
+      mesa-va-gallium \
+      libva-intel-driver \
+      perl \
+      ffmpeg \
+      imagemagick \
+      procps \
+      samba-client \
+      supervisor \
+#      libreoffice \
+    ;
+#COPY zz-docker.conf /usr/local/etc/
+#COPY smtp.config.php /var/www/config/smtp.config.php
+RUN apk add --no-cache supervisor \
+  && mkdir /var/log/supervisord /var/run/supervisord
+COPY supervisord.conf /
+#ENV NEXTCLOUD_UPDATE=1
+CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

toffonccompose.yml

@@ -0,0 +1,138 @@
+version: "3"
+services:
+  db:
+    image: postgres:alpine
+    restart: always
+    volumes:
+      - /apps/ncalpine/db:/var/lib/postgresql/data:Z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
+    env_file:
+      - stack.env
+
+  redis:
+    image: redis:alpine
+    restart: always
+    sysctls:
+      - net.core.somaxconn=65535
+    volumes:
+      - /apps/ncalpine/redis-data:/data:rw
+#      - /etc/localtime:/etc/localtime:ro
+#      - /etc/timezone:/etc/timezone:ro
+
+  app:
+    build: ./fpm
+    image: nextcloudtoffo:fpm-alpine
+    restart: always
+    volumes:
+      - /apps/ncalpine/php/zz-docker.conf:/usr/local/etc/php/conf.d/zz-docker.conf:z,ro
+      - /apps/ncalpine/html:/var/www/html:z
+      - /apps/ncalpine/config:/var/www/html/config:z
+      - /apps/ncalpine/data:/var/www/html/data:z
+      - /Serie:/mnt/!!Series:z
+#      - /Serie/apps/nc_test/nextcloud/upload_tmp_dir:/tmp/nextcloudtemp:z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
+    environment:
+      - POSTGRES_HOST=db
+#      - OVERWRITECLIURL=https://toffo.pilsfree.net
+#      - OVERWRITEPROTOCOL=https
+      - NEXTCLOUD_TRUSTED_DOMAINS=toffo.pilsfree.net toffo.pilsfre.cz 192.168.200.200
+#      - OVERWRITEHOST=toffo.pilsfree.net
+      - default_phone_region=CZ
+      - REDIS_HOST=redis
+      - NEXTCLOUD_TRUSTED_PROXIES=192.168.112.0/24
+#      - UPLOAD_TMP_DIR=/tmp/nextcloudtemp
+#      - NEXTCLOUD_INIT_HTACCESS=true
+#      - NEXTCLOUD_UPDATE=1
+    devices:
+      - /dev/dri:/dev/dri
+    env_file:
+      - stack.env
+    depends_on:
+      - db
+      - redis
+ 
+  web:
+    build: ./web
+    restart: always
+    volumes:
+      - /apps/ncalpine/php/zz-docker.conf:/usr/local/etc/php/conf.d:z,ro
+      - /apps/ncalpine/html:/var/www/html:z,ro
+      - /apps/ncalpine/config:/var/www/html/config:z,ro
+      - /apps/ncalpine/data:/var/www/html/data:z,ro
+      - /Serie:/mnt/!!Series:z
+#      - /Serie/apps/nc_test/nextcloud/upload_tmp_dir:/tmp/nextcloudtemp:z
+      - /etc/localtime:/etc/localtime:z,ro
+      - /etc/timezone:/etc/timezone:z,ro
+    environment:
+      - VIRTUAL_HOST=toffo.pilsfree.net
+      - LETSENCRYPT_HOST=toffo.pilsfree.net
+      - LETSENCRYPT_EMAIL=toffo@pilsfree.net
+    depends_on:
+      - app
+    networks:
+      - proxy-tier
+      - default      
+
+  cron:
+    image: nextcloudtoffo:fpm-alpine
+    restart: always
+    volumes:
+      - /apps/ncalpine/php/conf.d:/usr/local/etc/php/conf.d:z,ro
+      - /apps/ncalpine/html:/var/www/html:z
+      - /apps/ncalpine/config:/var/www/html/config:z
+      - /apps/ncalpine/data:/var/www/html/data:z
+      - /Serie:/mnt/!!Series:z
+#      - /Serie/apps/nc_test/nextcloud/upload_tmp_dir:/tmp/nextcloudtemp:z
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    entrypoint: /cron.sh
+    depends_on:
+      - db
+      - redis
+
+  proxy:
+    build: ./proxy
+    restart: always
+    ports:
+      - 80:80
+      - 443:443
+    labels:
+      com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
+    volumes:
+      - /apps/ncalpine/log:/var/log/nginx:rw
+      - /apps/ncalpine/certs:/etc/nginx/certs:z,ro
+      - /apps/ncalpine/vhost.d:/etc/nginx/vhost.d:z
+      - /apps/ncalpine/html:/usr/share/nginx/html:z
+      - /var/run/docker.sock:/tmp/docker.sock:z,ro
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    networks:
+      - proxy-tier
+
+  letsencrypt-companion:
+    image: nginxproxy/acme-companion
+    restart: always
+    volumes:
+      - /apps/ncalpine/certs:/etc/nginx/certs:z
+      - /apps/ncalpine/acmetest:/etc/acme.sh:z
+      - /apps/ncalpine/vhost.d:/etc/nginx/vhost.d:z
+      - /apps/ncalpine/nginxhtml:/usr/share/nginx/html:z
+      - /var/run/docker.sock:/var/run/docker.sock:z,ro
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    networks:
+      - proxy-tier
+    depends_on:
+      - proxy
+
+networks:
+# - net.ipv6.conf.all.disable_ipv6=1
+  proxy-tier:
+    name: proxy-tier
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 192.168.112.0/24
+          gateway: 192.168.112.1