From a16b4f71ccc1949b7e9191a5b389436de45b0424 Mon Sep 17 00:00:00 2001 From: Melvin mngmt-02 Date: Fri, 13 Oct 2023 16:14:17 +0200 Subject: [PATCH 1/4] making NEXTCLOUD_TRUSTED_DOMAINS after install Signed-off-by: Melvin mngmt-02 Signed-off-by: Melvin Suter --- 25/apache/config/trusteddomains.config.php | 7 +++++++ 25/fpm-alpine/config/trusteddomains.config.php | 7 +++++++ 25/fpm/config/trusteddomains.config.php | 7 +++++++ 26/apache/config/trusteddomains.config.php | 7 +++++++ 26/fpm-alpine/config/trusteddomains.config.php | 7 +++++++ 26/fpm/config/trusteddomains.config.php | 7 +++++++ 27/apache/config/trusteddomains.config.php | 7 +++++++ 27/fpm-alpine/config/trusteddomains.config.php | 7 +++++++ 27/fpm/config/trusteddomains.config.php | 7 +++++++ 9 files changed, 63 insertions(+) create mode 100644 25/apache/config/trusteddomains.config.php create mode 100644 25/fpm-alpine/config/trusteddomains.config.php create mode 100644 25/fpm/config/trusteddomains.config.php create mode 100644 26/apache/config/trusteddomains.config.php create mode 100644 26/fpm-alpine/config/trusteddomains.config.php create mode 100644 26/fpm/config/trusteddomains.config.php create mode 100644 27/apache/config/trusteddomains.config.php create mode 100644 27/fpm-alpine/config/trusteddomains.config.php create mode 100644 27/fpm/config/trusteddomains.config.php diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/25/apache/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/25/fpm-alpine/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/25/fpm/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/26/apache/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/26/fpm-alpine/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/26/fpm/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/27/apache/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/27/fpm-alpine/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php new file mode 100644 index 00000000..32019f32 --- /dev/null +++ b/27/fpm/config/trusteddomains.config.php @@ -0,0 +1,7 @@ + array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + ); +} From d13714b973222e5a1973dd801f1cb573048b9237 Mon Sep 17 00:00:00 2001 From: Melvin mngmt-02 Date: Fri, 13 Oct 2023 16:34:25 +0200 Subject: [PATCH 2/4] backwards compatibility Signed-off-by: Melvin mngmt-02 Signed-off-by: Melvin Suter --- 25/apache/config/trusteddomains.config.php | 6 +++++- 25/fpm-alpine/config/trusteddomains.config.php | 6 +++++- 25/fpm/config/trusteddomains.config.php | 6 +++++- 26/apache/config/trusteddomains.config.php | 6 +++++- 26/fpm-alpine/config/trusteddomains.config.php | 6 +++++- 26/fpm/config/trusteddomains.config.php | 6 +++++- 27/apache/config/trusteddomains.config.php | 6 +++++- 27/fpm-alpine/config/trusteddomains.config.php | 6 +++++- 27/fpm/config/trusteddomains.config.php | 6 +++++- 9 files changed, 45 insertions(+), 9 deletions(-) diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/25/apache/config/trusteddomains.config.php +++ b/25/apache/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/25/fpm-alpine/config/trusteddomains.config.php +++ b/25/fpm-alpine/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/25/fpm/config/trusteddomains.config.php +++ b/25/fpm/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/26/apache/config/trusteddomains.config.php +++ b/26/apache/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/26/fpm-alpine/config/trusteddomains.config.php +++ b/26/fpm-alpine/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/26/fpm/config/trusteddomains.config.php +++ b/26/fpm/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/27/apache/config/trusteddomains.config.php +++ b/27/apache/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/27/fpm-alpine/config/trusteddomains.config.php +++ b/27/fpm-alpine/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php index 32019f32..5994628b 100644 --- a/27/fpm/config/trusteddomains.config.php +++ b/27/fpm/config/trusteddomains.config.php @@ -1,7 +1,11 @@ array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))) + 'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) ); } From 5a8fe00c14120f7a4b6f4fdfb4f404cd132d9f1c Mon Sep 17 00:00:00 2001 From: Melvin Suter Date: Mon, 16 Oct 2023 11:15:40 +0200 Subject: [PATCH 3/4] Moving Config file to right dir Signed-off-by: Melvin Suter --- .../config => .config}/trusteddomains.config.php | 0 25/fpm-alpine/config/trusteddomains.config.php | 11 ----------- 25/fpm/config/trusteddomains.config.php | 11 ----------- 26/apache/config/trusteddomains.config.php | 11 ----------- 26/fpm-alpine/config/trusteddomains.config.php | 11 ----------- 26/fpm/config/trusteddomains.config.php | 11 ----------- 27/apache/config/trusteddomains.config.php | 11 ----------- 27/fpm-alpine/config/trusteddomains.config.php | 11 ----------- 27/fpm/config/trusteddomains.config.php | 11 ----------- 9 files changed, 88 deletions(-) rename {25/apache/config => .config}/trusteddomains.config.php (100%) delete mode 100644 25/fpm-alpine/config/trusteddomains.config.php delete mode 100644 25/fpm/config/trusteddomains.config.php delete mode 100644 26/apache/config/trusteddomains.config.php delete mode 100644 26/fpm-alpine/config/trusteddomains.config.php delete mode 100644 26/fpm/config/trusteddomains.config.php delete mode 100644 27/apache/config/trusteddomains.config.php delete mode 100644 27/fpm-alpine/config/trusteddomains.config.php delete mode 100644 27/fpm/config/trusteddomains.config.php diff --git a/25/apache/config/trusteddomains.config.php b/.config/trusteddomains.config.php similarity index 100% rename from 25/apache/config/trusteddomains.config.php rename to .config/trusteddomains.config.php diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/25/fpm-alpine/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/25/fpm/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/26/apache/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/26/fpm-alpine/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/26/fpm/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/27/apache/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/27/fpm-alpine/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php deleted file mode 100644 index 5994628b..00000000 --- a/27/fpm/config/trusteddomains.config.php +++ /dev/null @@ -1,11 +0,0 @@ - array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))) - ); -} From f6d767efb1c8853952c138f4b6429a2441fbe6e6 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Sun, 22 Sep 2024 00:34:53 +0000 Subject: [PATCH 4/4] 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; \