Ensure overwritable files are sorted

2025-12-10 11:01:14 +00:00 · 2018-08-03 01:36:20 +02:00
parent f42a90758f
commit 864e503563
24 changed files with 28 additions and 28 deletions
--- a/Dockerfiles/base/Dockerfile-5.2
+++ b/Dockerfiles/base/Dockerfile-5.2
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.2.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-5.3
+++ b/Dockerfiles/base/Dockerfile-5.3
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-5.4
+++ b/Dockerfiles/base/Dockerfile-5.4
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-5.5
+++ b/Dockerfiles/base/Dockerfile-5.5
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-5.6
+++ b/Dockerfiles/base/Dockerfile-5.6
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-7.0
+++ b/Dockerfiles/base/Dockerfile-7.0
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-7.1
+++ b/Dockerfiles/base/Dockerfile-7.1
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-7.2
+++ b/Dockerfiles/base/Dockerfile-7.2
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/base/Dockerfile-7.3
+++ b/Dockerfiles/base/Dockerfile-7.3
@@ -57,7 +57,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/prod/data/docker-entrypoint.d/35-custom-ini-files.sh
+++ b/Dockerfiles/prod/data/docker-entrypoint.d/35-custom-ini-files.sh
@@ -27,8 +27,8 @@ copy_ini_files() {
 	'
 	for ini_f in ${ini_files}; do
 		ini_name="$( basename "${ini_f}" )"
-		log "info" "PHP.ini: ${ini_name} -> ${ini_dst}/zzz-devilbox-${ini_name}" "${debug}"
-		run "cp ${ini_f} ${ini_dst}/zzz-devilbox-${ini_name}" "${debug}"
+		log "info" "PHP.ini: ${ini_name} -> ${ini_dst}/yyy-devilbox-user-runtime-${ini_name}" "${debug}"
+		run "cp ${ini_f} ${ini_dst}/yyy-devilbox-user-runtime-${ini_name}" "${debug}"
 	done
 	run "find ${ini_dst} -type f -iname '*.ini' -exec chmod 0644 \"{}\" \;" "${debug}"
 }
--- a/Dockerfiles/prod/data/docker-entrypoint.d/36-custom-php-fpm-files.sh
+++ b/Dockerfiles/prod/data/docker-entrypoint.d/36-custom-php-fpm-files.sh
@@ -27,8 +27,8 @@ copy_fpm_files() {
 	'
 	for fpm_f in ${fpm_files}; do
 		fpm_name="$( basename "${fpm_f}" )"
-		log "info" "PHP-FPM.conf: ${fpm_name} -> ${fpm_dst}/zzz-devilbox-${fpm_name}" "${debug}"
-		run "cp ${fpm_f} ${fpm_dst}/zzz-devilbox-${fpm_name}" "${debug}"
+		log "info" "PHP-FPM.conf: ${fpm_name} -> ${fpm_dst}/yyy-devilbox-user-runtime-${fpm_name}" "${debug}"
+		run "cp ${fpm_f} ${fpm_dst}/yyy-devilbox-user-runtime-${fpm_name}" "${debug}"
 	done
 	run "find ${fpm_dst} -type f -iname '*.conf' -exec chmod 0644 \"{}\" \;" "${debug}"
 }
--- a/Dockerfiles/prod/data/docker-entrypoint.sh
+++ b/Dockerfiles/prod/data/docker-entrypoint.sh
@@ -28,8 +28,8 @@ PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 PHP_MAIL_LOG="/var/log/mail.log"

 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzzzzzz-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzzzzzz-logfiles.ini"
+PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
+PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"

 # PHP-FPM log dir
 FPM_LOG_DIR="/var/log/php"
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -266,7 +266,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.2.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -310,7 +310,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -325,7 +325,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -334,7 +334,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -334,7 +334,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -334,7 +334,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -334,7 +334,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -334,7 +334,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -322,7 +322,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/Dockerfiles/work/data/docker-entrypoint.sh
+++ b/Dockerfiles/work/data/docker-entrypoint.sh
@@ -28,8 +28,8 @@ PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 PHP_MAIL_LOG="/var/log/mail.log"

 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzzzzzz-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzzzzzz-logfiles.ini"
+PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
+PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"

 # PHP-FPM log dir
 FPM_LOG_DIR="/var/log/php"
--- a/build/ansible/DOCKERFILES/Dockerfile-base.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2
@@ -65,7 +65,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -191,7 +191,7 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/yyy-devilbox.ini
+COPY ./data/php-ini.d/php-{{ php_version }}.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
 COPY ./data/php-fpm.conf/php-fpm-{{ php_version }}.conf /usr/local/etc/php-fpm.conf

 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh