Merge branch 'master' of https://git.vbchaos.nl/private/docker-swarm

compose/nextcloud-fpm/docker-compose.yml

@@ -6,19 +6,22 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/nextcloud/home
+#      device: /nctest/home
+      device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/home
   ncdb:
     driver: local
     driver_opts:
       type: none
       o: bind
-      device: /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/nextcloud/database
+#      device: /nctest/db
+      device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/database
   ncdata:
     driver: local
     driver_opts:
       type: none
       o: bind
-      device: /srv/dev-disk-by-uuid-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/nextcloud/storage
+#      device: /nctest/storage
+      device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/storage
 
 
 services:
@@ -35,7 +38,11 @@ services:
       - MYSQL_USER=nextcloud
 
   nextcloud:
-    build: ./nc-fpm
+    build: 
+      context: ./nc-fpm
+      args: 
+        UID: ${MUID} 
+        GID: ${MGID} 
     restart: always
     links:
       - db
@@ -50,7 +57,11 @@ services:
       - REDIS_HOST=redis
 
   nginx:
-    build: ./nginx
+    build: 
+      context: ./nginx
+      args:
+        UID: ${MUID}
+        GID: ${MGID}
     restart: always
     ports:
       - 8888:80
@@ -60,7 +71,11 @@ services:
       - nchome:/var/www/html:z,ro
 
   redis:
-    image: redis:latest
+    build:
+      context: ./redis
+      args:
+        UID: ${MUID}
+        GID: ${MGID}
     restart: always
 
   cron:

compose/nextcloud-fpm/nc-fpm/Dockerfile

@@ -1,7 +1,10 @@
 FROM nextcloud:fpm
 
+ARG UID=1000
+ARG GID=1000
+
 #RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid 82 www-data
-RUN usermod -u 82 -o www-data
+RUN usermod -u $UID -o www-data
 RUN apt update \
     && apt -y install libmagickcore-6.q16-6-extra ffmpeg imagemagick ghostscript \
     && apt clean

compose/nextcloud-fpm/nginx/Dockerfile

@@ -1,5 +1,11 @@
-FROM nginx:alpine
+#FROM nginx:alpine
+FROM nginx:bullseye
 
-RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid 82 www-data
+ARG UID=1000
+ARG GID=1000
+
+RUN usermod -u $UID -o www-data
+
+#RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid $UID www-data
 
 COPY nginx.conf /etc/nginx/nginx.conf

compose/nextcloud-fpm/nginx/nginx.conf

@@ -31,7 +31,7 @@ http {
     #gzip  on;
 
     upstream php-handler {
-        server app:9000;
+        server nextcloud:9000;
     }
 
 

compose/nextcloud-fpm/redis/Dockerfile

@@ -0,0 +1,6 @@
+FROM redis:latest
+
+ARG UID=1000
+ARG GID=1000
+
+RUN usermod -u $UID -o www-data

compose/nextcloud-fpm/start.sh

@@ -0,0 +1,3 @@
+MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose build --no-cache
+MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose up -d --force-recreate
+