Ref #187 - Make custom ini files writable in rootless mode

phpmyadmin · Apr 2, 2024 · 2335c31 · 2335c31
1 parent 6a68779
commit 2335c31
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -68,7 +68,12 @@ RUN set -ex; \
         echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
         echo 'date.timezone=${TZ}'; \
         echo 'session.save_path=${SESSION_SAVE_PATH}'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini; \
+    \
+    { \
+        echo ''; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini; \
+    chown www-data:www-data $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini;
 
 # Calculate download URL
 ENV VERSION %%VERSION%%

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -79,7 +79,12 @@ RUN set -ex; \
         echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
         echo 'date.timezone=${TZ}'; \
         echo 'session.save_path=${SESSION_SAVE_PATH}'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini; \
+    \
+    { \
+        echo ''; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini; \
+    chown www-data:www-data $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini;
 
 # Calculate download URL
 ENV VERSION %%VERSION%%

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -80,7 +80,12 @@ RUN set -ex; \
         echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
         echo 'date.timezone=${TZ}'; \
         echo 'session.save_path=${SESSION_SAVE_PATH}'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini; \
+    \
+    { \
+        echo ''; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini; \
+    chown www-data:www-data $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini;
 
 # Calculate download URL
 ENV VERSION 5.2.1

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -69,7 +69,12 @@ RUN set -ex; \
         echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
         echo 'date.timezone=${TZ}'; \
         echo 'session.save_path=${SESSION_SAVE_PATH}'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini; \
+    \
+    { \
+        echo ''; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini; \
+    chown www-data:www-data $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini;
 
 # Calculate download URL
 ENV VERSION 5.2.1

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -77,7 +77,12 @@ RUN set -ex; \
         echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
         echo 'date.timezone=${TZ}'; \
         echo 'session.save_path=${SESSION_SAVE_PATH}'; \
-    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini; \
+    \
+    { \
+        echo ''; \
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini; \
+    chown www-data:www-data $PHP_INI_DIR/conf.d/phpmyadmin-hide-php-version.ini;
 
 # Calculate download URL
 ENV VERSION 5.2.1