Use $PHP_INI_DIR var (#1765)

tclavier · J0WI · web-flow · commit 502fda1f7af9 · 2022-06-30T13:12:07.000Z
* Use $PHP_INI_DIR var

* Update 24/fpm/Dockerfile

Co-authored-by: J0WI &lt;J0WI@users.noreply.github.com&gt;

* Update 24/fpm/Dockerfile

Co-authored-by: J0WI &lt;J0WI@users.noreply.github.com&gt;

Co-authored-by: J0WI &lt;J0WI@users.noreply.github.com&gt;
diff --git a/24/fpm/Dockerfile b/24/fpm/Dockerfile
@@ -99,13 +99,13 @@ RUN { \
         echo 'opcache.revalidate_freq=60'; \
     } > /usr/local/etc/php/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
`@@ -99,13 +99,13 @@ RUN { \`
`99`	`99`	`echo 'opcache.revalidate_freq=60'; \`
`100`	`100`	`} > /usr/local/etc/php/conf.d/opcache-recommended.ini; \`
`101`	`101`	`\`
`102`		`- echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \`
	`102`	`+ echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \`
`103`	`103`	`\`
`104`	`104`	`{ \`
`105`	`105`	`echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \`
`106`	`106`	`echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \`
`107`	`107`	`echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \`
`108`		`- } > /usr/local/etc/php/conf.d/nextcloud.ini; \`
	`108`	`+ } > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \`
`109`	`109`	`\`
`110`	`110`	`mkdir /var/www/data; \`
`111`	`111`	`chown -R www-data:root /var/www; \`