Merge pull request #17 from craftcms/environment-overrides

Place the ini file in the correct path
craftcms · Sep 5, 2024 · ad07d89 · ad07d89
2 parents 64e6623 + 72d3dd4
commit ad07d89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -75,7 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 COPY etc/supervisord.conf /etc/supervisord.conf
 COPY etc/supervisord.d /etc/supervisord.d
 COPY etc/php-fpm/php-fpm.conf /etc/php-fpm.conf
-COPY etc/php.d/60-craftcms.ini /etc/php.d/60-craftcms.ini
+COPY etc/php.d/60-craftcms.ini /etc/php/${php_version}/fpm/conf.d/60-craftcms.ini
 
 # set a friendly path for php-fpm that does not have the version
 RUN update-alternatives --install /usr/sbin/php-fpm php-fpm /usr/sbin/php-fpm${php_version} 1

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE ?= craftcms/image
-PHP_VERSION ?= 8.2
+PHP_VERSION ?= 8.3
 UBUNTU_VERSION ?= 22.04
 TAG ?= ${PHP_VERSION}
 
@@ -26,4 +26,4 @@ create-project:
 	composer create-project craftcms/craft examples/craftcms/local
 
 shell:
-	docker run --rm -it ubuntu:${UBUNTU_VERSION} /bin/bash
+	docker run --rm -it ubuntu:${UBUNTU_VERSION} /bin/bash