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

This reverts commit 2335c31.
phpmyadmin · Aug 20, 2024 · 0109a4f · 0109a4f
1 parent a0e2d0f
commit 0109a4f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -68,12 +68,7 @@ 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; \
-    \
-    { \
-        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;
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
 
 # Calculate download URL
 ENV VERSION %%VERSION%%

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -79,12 +79,7 @@ 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; \
-    \
-    { \
-        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;
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
 
 # Calculate download URL
 ENV VERSION %%VERSION%%

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -80,12 +80,7 @@ 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; \
-    \
-    { \
-        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;
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
 
 # Calculate download URL
 ENV VERSION 5.2.1

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -69,12 +69,7 @@ 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; \
-    \
-    { \
-        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;
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
 
 # Calculate download URL
 ENV VERSION 5.2.1

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -77,12 +77,7 @@ 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; \
-    \
-    { \
-        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;
+    } > $PHP_INI_DIR/conf.d/phpmyadmin-misc.ini
 
 # Calculate download URL
 ENV VERSION 5.2.1