From a59c08012575ae6c6f4fe396486b4cd18da9abdc Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Thu, 5 Sep 2024 11:24:56 -0400 Subject: [PATCH 1/3] Place the ini file in the correct path --- Dockerfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80a3766..3eaa105 100644 --- 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}/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 index 026aa07..951cf86 100644 --- 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 \ No newline at end of file + docker run --rm -it ubuntu:${UBUNTU_VERSION} /bin/bash From 72d3dd47cb2877b57f4d88c9b44231500fd0068b Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Thu, 5 Sep 2024 11:27:39 -0400 Subject: [PATCH 2/3] Place in conf.d --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3eaa105..081078e 100644 --- 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/${php_version}/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 From 77f50583aff272056529b1cebceb77f07984581f Mon Sep 17 00:00:00 2001 From: Jason McCallister Date: Thu, 5 Sep 2024 13:12:22 -0400 Subject: [PATCH 3/3] Also configure the CLI --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 081078e..b0b3785 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,6 +76,7 @@ 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/${php_version}/fpm/conf.d/60-craftcms.ini +COPY etc/php.d/60-craftcms.ini /etc/php/${php_version}/cli/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