From b6c983426ce5328f585ac78d6579b1cad03cc650 Mon Sep 17 00:00:00 2001 From: SebastianRzk Date: Sun, 18 Aug 2024 16:49:24 +0200 Subject: [PATCH 1/2] replace build image with bind mount Signed-off-by: SebastianRzk --- .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 3 ++- .../docker-compose/insecure/mariadb/fpm/{web => }/nginx.conf | 0 .examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile | 3 --- .../docker-compose/insecure/postgres/fpm/docker-compose.yml | 3 ++- .../docker-compose/insecure/postgres/fpm/{web => }/nginx.conf | 0 .examples/docker-compose/insecure/postgres/fpm/web/Dockerfile | 3 --- .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 3 ++- .../with-nginx-proxy/mariadb/fpm/{web => }/nginx.conf | 0 .../docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile | 3 --- .../with-nginx-proxy/postgres/fpm/docker-compose.yml | 3 ++- .../with-nginx-proxy/postgres/fpm/{web => }/nginx.conf | 0 .../with-nginx-proxy/postgres/fpm/web/Dockerfile | 3 --- 12 files changed, 8 insertions(+), 16 deletions(-) rename .examples/docker-compose/insecure/mariadb/fpm/{web => }/nginx.conf (100%) delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile rename .examples/docker-compose/insecure/postgres/fpm/{web => }/nginx.conf (100%) delete mode 100644 .examples/docker-compose/insecure/postgres/fpm/web/Dockerfile rename .examples/docker-compose/with-nginx-proxy/mariadb/fpm/{web => }/nginx.conf (100%) delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile rename .examples/docker-compose/with-nginx-proxy/postgres/fpm/{web => }/nginx.conf (100%) delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index e293a92c..d555d29e 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml @@ -33,12 +33,13 @@ services: - redis web: - build: ./web + image: nginx:alpine restart: always ports: - 127.0.0.1:8080:80 volumes: - nextcloud:/var/www/html:z,ro + - ./nginx.conf:/etc/nginx/nginx.conf depends_on: - app diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/nginx.conf similarity index 100% rename from .examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf rename to .examples/docker-compose/insecure/mariadb/fpm/nginx.conf diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile deleted file mode 100644 index 9e620aff..00000000 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine - -COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml index 97343ad9..3b6beec4 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml +++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml @@ -28,12 +28,13 @@ services: - redis web: - build: ./web + image: nginx:alpine restart: always ports: - 127.0.0.1:8080:80 volumes: - nextcloud:/var/www/html:z,ro + - ./nginx.conf:/etc/nginx/nginx.conf depends_on: - app diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/nginx.conf similarity index 100% rename from .examples/docker-compose/insecure/postgres/fpm/web/nginx.conf rename to .examples/docker-compose/insecure/postgres/fpm/nginx.conf diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile deleted file mode 100644 index 9e620aff..00000000 --- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine - -COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml index 94196e9f..a127ba0e 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml @@ -33,10 +33,11 @@ services: - redis web: - build: ./web + image: nginx:alpine restart: always volumes: - nextcloud:/var/www/html:z,ro + - ./nginx.conf:/etc/nginx/nginx.conf environment: - VIRTUAL_HOST= - LETSENCRYPT_HOST= diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/nginx.conf similarity index 100% rename from .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf rename to .examples/docker-compose/with-nginx-proxy/mariadb/fpm/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile deleted file mode 100644 index 9e620aff..00000000 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine - -COPY nginx.conf /etc/nginx/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml index 008d74af..6ac36a1f 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml @@ -28,10 +28,11 @@ services: - redis web: - build: ./web + image: nginx:alpine restart: always volumes: - nextcloud:/var/www/html:z,ro + - ./nginx.conf:/etc/nginx/nginx.conf environment: - VIRTUAL_HOST= - LETSENCRYPT_HOST= diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/nginx.conf similarity index 100% rename from .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf rename to .examples/docker-compose/with-nginx-proxy/postgres/fpm/nginx.conf diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile deleted file mode 100644 index 9e620aff..00000000 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine - -COPY nginx.conf /etc/nginx/nginx.conf From f6d767efb1c8853952c138f4b6429a2441fbe6e6 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Sun, 22 Sep 2024 00:34:53 +0000 Subject: [PATCH 2/2] Runs update.sh --- 28/apache/Dockerfile | 2 +- 28/fpm-alpine/Dockerfile | 2 +- 28/fpm/Dockerfile | 2 +- 29/apache/Dockerfile | 2 +- 29/fpm-alpine/Dockerfile | 2 +- 29/fpm/Dockerfile | 2 +- 30/apache/Dockerfile | 2 +- 30/fpm-alpine/Dockerfile | 2 +- 30/fpm/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile index 9ac2e524..f9637bd7 100644 --- a/28/apache/Dockerfile +++ b/28/apache/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile index 02ab2450..24f4d938 100644 --- a/28/fpm-alpine/Dockerfile +++ b/28/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile index 17432c85..4a8da235 100644 --- a/28/fpm/Dockerfile +++ b/28/fpm/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index 371d4cd7..a81658c2 100644 --- a/29/apache/Dockerfile +++ b/29/apache/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index 5e8aa0f8..017de203 100644 --- a/29/fpm-alpine/Dockerfile +++ b/29/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index a134d720..00776307 100644 --- a/29/fpm/Dockerfile +++ b/29/fpm/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 93642f7b..907fc57e 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 11c6e1ba..a8b5faa6 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -63,7 +63,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index e9a09f6a..e2a52ed2 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -65,7 +65,7 @@ RUN set -ex; \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately - pecl install APCu-5.1.23; \ + pecl install APCu-5.1.24; \ pecl install imagick-3.7.0; \ pecl install memcached-3.2.0; \ pecl install redis-6.0.2; \