@@ -112,17 +112,20 @@ TARGET_MAX_CHAR_NUM=20
112
112
IS_DRUPAL_PSSWD_FILE_READABLE := $(shell test -r secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD -a -w secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD && echo 1 || echo 0)
113
113
CMD := $(shell [ $(IS_DRUPAL_PSSWD_FILE_READABLE ) -eq 1 ] && echo 'tee' || echo 'sudo -k tee')
114
114
115
+ PHP_VERSION =83
115
116
LATEST_VERSION := $(shell curl -s https://api.github.com/repos/desandro/masonry/releases/latest | grep '\"tag_name\":' | sed -E 's/.* \"([^\"]+) \".*/\1/')
116
117
117
118
PHP_FPM_PID =/var/run/php-fpm7/php-fpm7.pid
118
119
ifeq ($(shell expr $(TAG ) \>= 3.2) , 1)
119
- PHP_FPM_PID=/var/run/php-fpm83 /php-fpm83.pid
120
+ PHP_FPM_PID=/var/run/php-fpm${PHP_VERSION} /php-fpm83.pid
120
121
else ifeq ($(shell expr $(TAG) \>= 3.0), 1)
121
- PHP_FPM_PID=/var/run/php-fpm82 /php-fpm82 .pid
122
+ PHP_FPM_PID=/var/run/php-fpm${PHP_VERSION} /php-fpm${PHP_VERSION} .pid
122
123
else ifeq ($(shell expr $(TAG) \>= 2.0), 1)
123
- PHP_FPM_PID=/var/run/php-fpm81 /php-fpm81 .pid
124
+ PHP_FPM_PID=/var/run/php-fpm${PHP_VERSION} /php-fpm${PHP_VERSION} .pid
124
125
endif
125
126
127
+
128
+
126
129
# ############################################
127
130
# # Default Rule ##
128
131
# ############################################
@@ -696,9 +699,9 @@ wait-for-drupal-locally:
696
699
# # Turn on xdebug.
697
700
xdebug :
698
701
sleep 6
699
- docker compose exec -T drupal with-contenv bash -lc " apk add php82 -pecl-xdebug"
700
- docker cp scripts/extra/xdebug.ini $$(docker compose ps -q drupal ) :/etc/php82 /conf.d/xdebug.ini
701
- -docker compose exec -T drupal with-contenv bash -lc " chown root:root /etc/php82 /conf.d/xdebug.ini"
702
+ docker compose exec -T drupal with-contenv bash -lc " apk add php ${PHP_VERSION} -pecl-xdebug"
703
+ docker cp scripts/extra/xdebug.ini $$(docker compose ps -q drupal ) :/etc/php ${PHP_VERSION} /conf.d/xdebug.ini
704
+ -docker compose exec -T drupal with-contenv bash -lc " chown root:root /etc/php ${PHP_VERSION} _ /conf.d/xdebug.ini"
702
705
docker compose restart drupal
703
706
sleep 6
704
707
docker compose exec -T drupal with-contenv bash -lc " php -i | grep xdebug"
0 commit comments