Merge 0bb3a0417f into 1c8d764f3c

Runs update.sh
updated compose according to #1608
2025-07-31 10:38:05 +02:00 · 2024-09-14 13:29:08 +02:00 · 2024-09-13 00:30:28 +00:00 · 2023-06-12 16:24:00 +02:00
24 changed files with 65 additions and 25 deletions
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -30,6 +33,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/mariadb/apache/redis.env
+++ b/.examples/docker-compose/insecure/mariadb/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -28,6 +31,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/mariadb/fpm/redis.env
+++ b/.examples/docker-compose/insecure/mariadb/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -25,6 +28,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/postgres/apache/redis.env
+++ b/.examples/docker-compose/insecure/postgres/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -23,6 +26,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/postgres/fpm/redis.env
+++ b/.examples/docker-compose/insecure/postgres/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -31,6 +34,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -28,6 +31,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -26,6 +29,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -23,6 +26,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@ -140,7 +140,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 28.0.10

 RUN set -ex; \
    fetchDeps=" \
@ -150,8 +150,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-28.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 28.0.10

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -128,8 +128,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 28.0.9
+ENV NEXTCLOUD_VERSION 28.0.10

 RUN set -ex; \
    fetchDeps=" \
@ -135,8 +135,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-28.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.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/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -140,7 +140,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.0.7

 RUN set -ex; \
    fetchDeps=" \
@ -150,8 +150,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.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.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
@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.0.7

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -128,8 +128,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.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
@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.6
+ENV NEXTCLOUD_VERSION 29.0.7

 RUN set -ex; \
    fetchDeps=" \
@ -135,8 +135,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.6.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.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 @@
-29.0.6
+29.0.7
--- a/versions.json
+++ b/versions.json
@ -1,9 +1,9 @@
 {
  "29": {
    "branch": "29",
-    "version": "29.0.6",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.6.tar.bz2.asc",
+    "version": "29.0.7",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.7.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
@ -27,9 +27,9 @@
  },
  "28": {
    "branch": "28",
-    "version": "28.0.9",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.9.tar.bz2.asc",
+    "version": "28.0.10",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.10.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
Author	SHA1	Message	Date
Fee Fladder	a269b694bc	Merge `0bb3a0417f` into `1c8d764f3c`	2024-09-14 13:29:08 +02:00
GitHub Workflow	1c8d764f3c	Runs update.sh	2024-09-13 00:30:28 +00:00
Fee Gevaert	0bb3a0417f	updated compose according to #1608 Signed-off-by: Fee Gevaert <fee.gevaert@opengeohub.org>	2023-06-12 16:24:00 +02:00
 @ -1 +1 @@
 .0.6
 .0.7