From 74587b66a8d03443e3bcdf36573c53ba7f726b5a Mon Sep 17 00:00:00 2001 From: matthias Date: Mon, 24 Jul 2023 22:02:51 +0200 Subject: [PATCH 1/2] Updated nextcloud to work dynamically with www-data ID and GID --- compose/nextcloud-fpm/docker-compose.yml | 29 ++++++++++++++++++------ compose/nextcloud-fpm/nc-fpm/Dockerfile | 5 +++- compose/nextcloud-fpm/nginx/Dockerfile | 10 ++++++-- compose/nextcloud-fpm/nginx/nginx.conf | 2 +- compose/nextcloud-fpm/redis/Dockerfile | 6 +++++ 5 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 compose/nextcloud-fpm/redis/Dockerfile diff --git a/compose/nextcloud-fpm/docker-compose.yml b/compose/nextcloud-fpm/docker-compose.yml index c4ab476..2ef88e8 100644 --- a/compose/nextcloud-fpm/docker-compose.yml +++ b/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-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/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-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/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-f3ca381b-e85a-4348-8086-833317c5d96e/dockerstorage/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,17 +57,25 @@ services: - REDIS_HOST=redis nginx: - build: ./nginx + build: + context: ./nginx + args: + UID: ${MUID} + GID: ${MGID} restart: always ports: - - 8888:80 + - 8899:80 links: - nextcloud volumes: - nchome:/var/www/html:z,ro redis: - image: redis:latest + build: + context: ./redis + args: + UID: ${MUID} + GID: ${MGID} restart: always cron: diff --git a/compose/nextcloud-fpm/nc-fpm/Dockerfile b/compose/nextcloud-fpm/nc-fpm/Dockerfile index a897041..5d787ad 100644 --- a/compose/nextcloud-fpm/nc-fpm/Dockerfile +++ b/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 diff --git a/compose/nextcloud-fpm/nginx/Dockerfile b/compose/nextcloud-fpm/nginx/Dockerfile index c9b088b..5e76d82 100644 --- a/compose/nextcloud-fpm/nginx/Dockerfile +++ b/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 diff --git a/compose/nextcloud-fpm/nginx/nginx.conf b/compose/nextcloud-fpm/nginx/nginx.conf index b11210b..7b6e48c 100644 --- a/compose/nextcloud-fpm/nginx/nginx.conf +++ b/compose/nextcloud-fpm/nginx/nginx.conf @@ -31,7 +31,7 @@ http { #gzip on; upstream php-handler { - server app:9000; + server nextcloud:9000; } diff --git a/compose/nextcloud-fpm/redis/Dockerfile b/compose/nextcloud-fpm/redis/Dockerfile new file mode 100644 index 0000000..5770389 --- /dev/null +++ b/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 From 1d6720c5c24656d8cb48a4425d07623e3e686333 Mon Sep 17 00:00:00 2001 From: matthias Date: Tue, 25 Jul 2023 11:55:56 +0200 Subject: [PATCH 2/2] fixed nextcloud bugs after last updates and added dedicated start script --- compose/nextcloud-fpm/docker-compose.yml | 14 +++++++------- compose/nextcloud-fpm/start.sh | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100755 compose/nextcloud-fpm/start.sh diff --git a/compose/nextcloud-fpm/docker-compose.yml b/compose/nextcloud-fpm/docker-compose.yml index 2ef88e8..ccf14ce 100644 --- a/compose/nextcloud-fpm/docker-compose.yml +++ b/compose/nextcloud-fpm/docker-compose.yml @@ -6,22 +6,22 @@ volumes: driver_opts: type: none o: bind - device: /nctest/home -# 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: /nctest/db -# 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: /nctest/storage -# 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: @@ -64,7 +64,7 @@ services: GID: ${MGID} restart: always ports: - - 8899:80 + - 8888:80 links: - nextcloud volumes: diff --git a/compose/nextcloud-fpm/start.sh b/compose/nextcloud-fpm/start.sh new file mode 100755 index 0000000..58e6caf --- /dev/null +++ b/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 +