Merge fd43b6408c into 7da5fa1c6b

Runs update.sh
allow dynamic ip resolve on php handler
2025-04-20 02:46:10 +02:00 · 2025-04-11 01:36:49 +00:00 · 2025-04-11 00:36:17 +00:00 · 2025-03-20 22:26:16 +01:00
15 changed files with 49 additions and 57 deletions
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@ -10,6 +10,7 @@ events {


 http {
+    resolver 127.0.0.11 valid=1s;
    include mime.types;
    default_type  application/octet-stream;
    types {
@ -39,12 +40,9 @@ http {

    #gzip  on;

-    upstream php-handler {
-        server app:9000;
-    }
-
    server {
        listen 80;
+	    set $php_handler app:9000;

        # HSTS settings
        # WARNING: Only add the preload option once you read about
@ -158,7 +156,7 @@ http {

            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
            fastcgi_param front_controller_active true;     # Enable pretty urls
-            fastcgi_pass php-handler;
+            fastcgi_pass $php_handler;

            fastcgi_intercept_errors on;
            fastcgi_request_buffering off;
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@ -10,6 +10,7 @@ events {


 http {
+    resolver 127.0.0.11 valid=1s;
    include mime.types;
    default_type  application/octet-stream;
    types {
@ -39,12 +40,9 @@ http {

    #gzip  on;

-    upstream php-handler {
-        server app:9000;
-    }
-
    server {
        listen 80;
+	    set $php_handler app:9000;

        # HSTS settings
        # WARNING: Only add the preload option once you read about
@ -158,7 +156,7 @@ http {

            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
            fastcgi_param front_controller_active true;     # Enable pretty urls
-            fastcgi_pass php-handler;
+            fastcgi_pass $php_handler;

            fastcgi_intercept_errors on;
            fastcgi_request_buffering off;
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@ -10,6 +10,7 @@ events {


 http {
+    resolver 127.0.0.11 valid=1s;
    include mime.types;
    default_type  application/octet-stream;
    types {
@ -39,12 +40,9 @@ http {

    #gzip  on;

-    upstream php-handler {
-        server app:9000;
-    }
-
    server {
        listen 80;
+	    set $php_handler app:9000;

        # HSTS settings
        # WARNING: Only add the preload option once you read about
@ -158,7 +156,7 @@ http {

            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
            fastcgi_param front_controller_active true;     # Enable pretty urls
-            fastcgi_pass php-handler;
+            fastcgi_pass $php_handler;

            fastcgi_intercept_errors on;
            fastcgi_request_buffering off;
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@ -10,6 +10,7 @@ events {


 http {
+    resolver 127.0.0.11 valid=1s;
    include mime.types;
    default_type  application/octet-stream;
    types {
@ -39,12 +40,9 @@ http {

    #gzip  on;

-    upstream php-handler {
-        server app:9000;
-    }
-
    server {
        listen 80;
+	    set $php_handler app:9000;

        # HSTS settings
        # WARNING: Only add the preload option once you read about
@ -158,7 +156,7 @@ http {

            fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
            fastcgi_param front_controller_active true;     # Enable pretty urls
-            fastcgi_pass php-handler;
+            fastcgi_pass $php_handler;

            fastcgi_intercept_errors on;
            fastcgi_request_buffering off;
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -166,7 +166,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.15

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +176,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.15

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +154,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.14
+ENV NEXTCLOUD_VERSION 29.0.15

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +161,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -166,7 +166,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.9

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +176,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.9

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +154,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.8
+ENV NEXTCLOUD_VERSION 30.0.9

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +161,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@ -166,7 +166,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.3

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +176,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@ -146,7 +146,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.3

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +154,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@ -151,7 +151,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 31.0.2
+ENV NEXTCLOUD_VERSION 31.0.3

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +161,8 @@ RUN set -ex; \
    apt-get update; \
    apt-get install -y --no-install-recommends $fetchDeps; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/latest.txt
+++ b/latest.txt
@ -1 +1 @@
-31.0.2
+31.0.3
--- a/versions.json
+++ b/versions.json
@ -1,9 +1,9 @@
 {
  "31": {
    "branch": "31",
-    "version": "31.0.2",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.2.tar.bz2.asc",
+    "version": "31.0.3",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
@ -27,9 +27,9 @@
  },
  "30": {
    "branch": "30",
-    "version": "30.0.8",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.8.tar.bz2.asc",
+    "version": "30.0.9",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
@ -53,9 +53,9 @@
  },
  "29": {
    "branch": "29",
-    "version": "29.0.14",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.14.tar.bz2.asc",
+    "version": "29.0.15",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
Author	SHA1	Message	Date
SebastianRzk	0f45403afc	Merge `fd43b6408c` into `7da5fa1c6b`	2025-04-11 01:36:49 +00:00
GitHub Workflow	7da5fa1c6b	Runs update.sh	2025-04-11 00:36:17 +00:00
SebastianRzk	fd43b6408c	allow dynamic ip resolve on php handler Signed-off-by: SebastianRzk <github@sebastianruziczka.de>	2025-03-20 22:26:16 +01:00
 @ -1 +1 @@
 .0.2
 .0.3