Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct ini file location #18

Merged
merged 5 commits into from
Sep 5, 2024
Merged

Correct ini file location #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64e6623
Merge pull request #12 from craftcms/bugfix/php-version-argument
jasonmccallister Jun 7, 2024
a59c080
Place the ini file in the correct path
jasonmccallister Sep 5, 2024
72d3dd4
Place in conf.d
jasonmccallister Sep 5, 2024
ad07d89
Merge pull request #17 from craftcms/environment-overrides
jasonmccallister Sep 5, 2024
77f5058
Also configure the CLI
jasonmccallister Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ 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
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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IMAGE ?= craftcms/image
PHP_VERSION ?= 8.2
PHP_VERSION ?= 8.3
UBUNTU_VERSION ?= 22.04
TAG ?= ${PHP_VERSION}

Expand All @@ -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
Loading