From 470483bc73132ad57320c4b4caad1f51f08b68fe Mon Sep 17 00:00:00 2001 From: Joe Corall Date: Wed, 17 Apr 2024 14:01:27 -0400 Subject: [PATCH] Set default isle-buildkit tag to 3.2.1 for php83 --- Makefile | 4 +++- sample.env | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5497455ce..0035ecbf7 100644 --- a/Makefile +++ b/Makefile @@ -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) \>= 3.0), 1) +ifeq ($(shell expr $(TAG) \>= 3.2), 1) + PHP_FPM_PID=/var/run/php-fpm83/php-fpm83.pid +else 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 diff --git a/sample.env b/sample.env index 858655b50..df8e57d74 100644 --- a/sample.env +++ b/sample.env @@ -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=3.1.4 +TAG=3.2.1 ############################################################################### # Exposed Containers & Ports