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

Jump to bottom

Add php 8.2 // isle-buildkit:3.x support #367

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Add php 8.2 // isle-buildkit:3.x support #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c72b724
Add php 8.2 // isle-buildkit:3.x support
joecorall Nov 15, 2023
d44a549
Update sample.env
joecorall Nov 15, 2023
2313916
Update sample.env
joecorall Nov 15, 2023
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
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ CMD := $(shell [ $(IS_DRUPAL_PSSWD_FILE_READABLE) -eq 1 ] && echo 'tee' || echo
LATEST_VERSION := $(shell curl -s https://api.github.com/repos/desandro/masonry/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/')

PHP_FPM_PID=/var/run/php-fpm7/php-fpm7.pid
ifeq ($(shell expr $(TAG) \>= 2.0), 1)
ifeq ($(shell expr $(TAG) \>= 3.0), 1)
PHP_FPM_PID=/var/run/php-fpm82/php-fpm82.pid
else ifeq ($(shell expr $(TAG) \>= 2.0), 1)
PHP_FPM_PID=/var/run/php-fpm81/php-fpm81.pid
endif

Expand Down
4 changes: 2 additions & 2 deletions sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ CUSTOM_IMAGE_TAG=latest

# Packagist repo to use when creating a site with make starter
# Change this if you want to build from a different codebase than the starter site
CODEBASE_PACKAGE=islandora/islandora-starter-site:1.1.0
CODEBASE_PACKAGE=islandora/islandora-starter-site:1.2.0

# Includes `traefik` as a service, if false assume we are sharing a traefik
# from another project.
Expand Down Expand Up @@ -94,7 +94,7 @@ REPOSITORY=islandora

# The version of the isle-buildkit images, non isle-buildkit images have
# their versions specified explicitly in their respective docker-compose files.
TAG=2.0.4
TAG=3.0.0

###############################################################################
# Exposed Containers & Ports
Expand Down