Skip to content

Commit

Permalink
Merge pull request #367 from joecorall/patch-1
Browse files Browse the repository at this point in the history
Add php 8.2 // isle-buildkit:3.x support
  • Loading branch information
aOelschlager authored Nov 22, 2023
2 parents 80cb9e4 + 2313916 commit 4b1264c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Makefile
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
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

0 comments on commit 4b1264c

Please sign in to comment.