From 0109a4fbdd4144fa3585260527d200818ac76eaf Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 20 Aug 2024 20:11:24 +0200
Subject: [PATCH] Revert "Ref #187 - Make custom ini files writable in rootless
 mode"

This reverts commit 2335c3151b93ea6a4cf8779c4c90cb21572b6c50.
---
 Dockerfile-alpine.template | 7 +------
 Dockerfile-debian.template | 7 +------
 apache/Dockerfile          | 7 +------
 fpm-alpine/Dockerfile      | 7 +------
 fpm/Dockerfile             | 7 +------
 5 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 9393ada0..f2376397 100644
--- 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
index 49b436eb..7c757e09 100644
--- 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
index af95c138..2984356b 100644
--- 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
index 9a98124b..f9479944 100644
--- 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
index cc6c0657..4ec338b0 100644
--- 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