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

Fix php-fpm PID check for php8.1 #347

Merged
merged 6 commits into from
Sep 28, 2023
Merged

Fix php-fpm PID check for php8.1 #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc4aecf
Fix php-fpm PID check for php8.1
joecorall Jun 16, 2023
c606e09
Merge branch 'Islandora-Devops:development' into php-81-fpm-pid
joecorall Sep 13, 2023
dc0fdc0
Update starter site tag to work with Drupal 10
joecorall Sep 20, 2023
e8473ba
Set TAG to v2.0.1
joecorall Sep 20, 2023
d6ad64a
2.0.2
joecorall Sep 22, 2023
abfc849
2.0.3
joecorall Sep 27, 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
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ 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)
PHP_FPM_PID=/var/run/php-fpm81/php-fpm81.pid
endif

#############################################
## Default Rule ##
#############################################
Expand Down Expand Up @@ -526,7 +531,7 @@ remove_standard_profile_references_from_config:
## Creates required databases for drupal site(s) using environment variables.
.SILENT: drupal-database
drupal-database:
docker compose exec -T drupal timeout 300 bash -c "while ! test -e /var/run/nginx/nginx.pid -a -e /var/run/php-fpm7/php-fpm7.pid; do sleep 1; done"
docker compose exec -T drupal timeout 300 bash -c "while ! test -e /var/run/nginx/nginx.pid -a -e $(PHP_FPM_PID); do echo 'Waiting for nginx and php-fpm'; sleep 1; done"
docker compose exec -T drupal with-contenv bash -lc "for_all_sites create_database"


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:0.8.0
CODEBASE_PACKAGE=islandora/islandora-starter-site:1.1.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=1.0.10
TAG=2.0.3

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