Use $PHP_INI_DIR var (#1790)

J0WI · web-flow · commit cde03854f62e · 2022-07-18T16:53:48.000Z
Signed-off-by: J0WI &lt;J0WI@users.noreply.github.com&gt;
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -84,15 +84,15 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
-    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
+    echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
     \
     { \
         echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
-    } > /usr/local/etc/php/conf.d/nextcloud.ini; \
+    } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -98,15 +98,15 @@ RUN { \
         echo 'opcache.memory_consumption=128'; \
         echo 'opcache.save_comments=1'; \
         echo 'opcache.revalidate_freq=60'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
+    } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
     \
-    echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \
+    echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
     \
     { \
         echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
-    } > /usr/local/etc/php/conf.d/nextcloud.ini; \
+    } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
     \
     mkdir /var/www/data; \
     chown -R www-data:root /var/www; \

Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,15 @@ RUN { \`
`84`	`84`	`echo 'opcache.memory_consumption=128'; \`
`85`	`85`	`echo 'opcache.save_comments=1'; \`
`86`	`86`	`echo 'opcache.revalidate_freq=60'; \`
`87`		`- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \`
	`87`	`+ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \`
`88`	`88`	`\`
`89`		`- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \`
	`89`	`+ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \`
`90`	`90`	`\`
`91`	`91`	`{ \`
`92`	`92`	`echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \`
`93`	`93`	`echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \`
`94`	`94`	`echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \`
`95`		`- } > /usr/local/etc/php/conf.d/nextcloud.ini; \`
	`95`	`+ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \`
`96`	`96`	`\`
`97`	`97`	`mkdir /var/www/data; \`
`98`	`98`	`chown -R www-data:root /var/www; \`
Original file line number	Diff line number	Diff line change
`@@ -98,15 +98,15 @@ RUN { \`
`98`	`98`	`echo 'opcache.memory_consumption=128'; \`
`99`	`99`	`echo 'opcache.save_comments=1'; \`
`100`	`100`	`echo 'opcache.revalidate_freq=60'; \`
`101`		`- } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \`
	`101`	`+ } > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \`
`102`	`102`	`\`
`103`		`- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \`
	`103`	`+ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \`
`104`	`104`	`\`
`105`	`105`	`{ \`
`106`	`106`	`echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \`
`107`	`107`	`echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \`
`108`	`108`	`echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \`
`109`		`- } > /usr/local/etc/php/conf.d/nextcloud.ini; \`
	`109`	`+ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \`
`110`	`110`	`\`
`111`	`111`	`mkdir /var/www/data; \`
`112`	`112`	`chown -R www-data:root /var/www; \`