From 0bb3a0417f1cb45e7ad436799fafdc2c493790e1 Mon Sep 17 00:00:00 2001 From: Fee Gevaert Date: Mon, 12 Jun 2023 16:21:13 +0200 Subject: [PATCH 1/2] updated compose according to #1608 Signed-off-by: Fee Gevaert --- .../docker-compose/insecure/mariadb/apache/docker-compose.yml | 4 ++++ .examples/docker-compose/insecure/mariadb/apache/redis.env | 1 + .../docker-compose/insecure/mariadb/fpm/docker-compose.yml | 4 ++++ .examples/docker-compose/insecure/mariadb/fpm/redis.env | 1 + .../insecure/postgres/apache/docker-compose.yml | 4 ++++ .examples/docker-compose/insecure/postgres/apache/redis.env | 1 + .../docker-compose/insecure/postgres/fpm/docker-compose.yml | 4 ++++ .examples/docker-compose/insecure/postgres/fpm/redis.env | 1 + .../with-nginx-proxy/mariadb/apache/docker-compose.yml | 4 ++++ .../docker-compose/with-nginx-proxy/mariadb/apache/redis.env | 1 + .../with-nginx-proxy/mariadb/fpm/docker-compose.yml | 4 ++++ .../docker-compose/with-nginx-proxy/mariadb/fpm/redis.env | 1 + .../with-nginx-proxy/postgres/apache/docker-compose.yml | 4 ++++ .../docker-compose/with-nginx-proxy/postgres/apache/redis.env | 1 + .../with-nginx-proxy/postgres/fpm/docker-compose.yml | 4 ++++ .../docker-compose/with-nginx-proxy/postgres/fpm/redis.env | 1 + 16 files changed, 40 insertions(+) create mode 100644 .examples/docker-compose/insecure/mariadb/apache/redis.env create mode 100644 .examples/docker-compose/insecure/mariadb/fpm/redis.env create mode 100644 .examples/docker-compose/insecure/postgres/apache/redis.env create mode 100644 .examples/docker-compose/insecure/postgres/fpm/redis.env create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env create mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env create mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml index 11ff5bf9..8d47f173 100644 --- 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 diff --git a/.examples/docker-compose/insecure/mariadb/apache/redis.env b/.examples/docker-compose/insecure/mariadb/apache/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/apache/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml index e293a92c..d9c91105 100644 --- 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 diff --git a/.examples/docker-compose/insecure/mariadb/fpm/redis.env b/.examples/docker-compose/insecure/mariadb/fpm/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb/fpm/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml index 0a48bd05..8980d9dc 100644 --- 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 diff --git a/.examples/docker-compose/insecure/postgres/apache/redis.env b/.examples/docker-compose/insecure/postgres/apache/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/insecure/postgres/apache/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml index 97343ad9..70acf303 100644 --- 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 diff --git a/.examples/docker-compose/insecure/postgres/fpm/redis.env b/.examples/docker-compose/insecure/postgres/fpm/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/insecure/postgres/fpm/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml index b88a3594..cfa7a553 100644 --- 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 diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= 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..cd9b3f6b 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 @@ -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 diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml index 243e06cf..1850a13d 100644 --- 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 diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= 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..4813ae9c 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 @@ -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 diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env new file mode 100644 index 00000000..952b0c5c --- /dev/null +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env @@ -0,0 +1 @@ +REDIS_HOST_PASSWORD= From 1c8d764f3c8646abe4206c8215b3198b19c047bc Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Fri, 13 Sep 2024 00:30:28 +0000 Subject: [PATCH 2/2] Runs update.sh --- 28/apache/Dockerfile | 6 +++--- 28/fpm-alpine/Dockerfile | 6 +++--- 28/fpm/Dockerfile | 6 +++--- 29/apache/Dockerfile | 6 +++--- 29/fpm-alpine/Dockerfile | 6 +++--- 29/fpm/Dockerfile | 6 +++--- latest.txt | 2 +- versions.json | 12 ++++++------ 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile index a5f90873..9ac2e524 100644 --- 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; \ diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile index c0f2ad23..02ab2450 100644 --- 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; \ diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile index ec28043f..17432c85 100644 --- 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; \ diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index d594b561..371d4cd7 100644 --- 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; \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index 92fc51db..5e8aa0f8 100644 --- 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; \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index 8d8b8bb6..a134d720 100644 --- 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; \ diff --git a/latest.txt b/latest.txt index 5608157e..94bc752d 100644 --- a/latest.txt +++ b/latest.txt @@ -1 +1 @@ -29.0.6 +29.0.7 diff --git a/versions.json b/versions.json index 00ec7c24..6fc23089 100644 --- 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",