Merge 5a8fe00c14 into f6d767efb1

Runs update.sh
Moving Config file to right dir
2025-07-29 18:08:06 +02:00 · 2024-09-25 11:59:24 +03:00 · 2024-09-22 00:34:53 +00:00 · 2023-10-16 11:15:40 +02:00 · 2023-10-13 16:37:05 +02:00 · 2023-10-13 16:37:05 +02:00
10 changed files with 20 additions and 9 deletions
--- a/.config/trusteddomains.config.php
+++ b/.config/trusteddomains.config.php
@ -0,0 +1,11 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
+  $CONFIG = array(
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
+  );
+}
--- 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; \
--- 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; \
--- 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; \
--- 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; \
--- 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; \
--- 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; \
--- 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; \
--- 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; \
--- 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; \
Author	SHA1	Message	Date
Melvin Suter	fa39dc5d4d	Merge `5a8fe00c14` into `f6d767efb1`	2024-09-25 11:59:24 +03:00
GitHub Workflow	f6d767efb1	Runs update.sh	2024-09-22 00:34:53 +00:00
Melvin Suter	5a8fe00c14	Moving Config file to right dir Signed-off-by: Melvin Suter <github@suter.dev>	2023-10-16 11:15:40 +02:00
Melvin mngmt-02	d13714b973	backwards compatibility Signed-off-by: Melvin mngmt-02 <melvin@suter.dev> Signed-off-by: Melvin Suter <github@suter.dev>	2023-10-13 16:37:05 +02:00
Melvin mngmt-02	a16b4f71cc	making NEXTCLOUD_TRUSTED_DOMAINS after install Signed-off-by: Melvin mngmt-02 <melvin@suter.dev> Signed-off-by: Melvin Suter <github@suter.dev>	2023-10-13 16:37:05 +02:00