add PHP_VERSION env variable

Giuseppe Morelli · Giuseppe Morelli · commit 422d5ebebc22 · 2021-02-11T17:35:24.000+01:00
diff --git a/local/config/php/7.3/mods-available/devbox.ini b/local/config/php/7.3/mods-available/devbox.ini
diff --git a/local/config/php/7.3/mods-available/xdebug-custom.ini b/local/config/php/7.3/mods-available/xdebug-custom.ini
diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -27,6 +27,8 @@ services:
 #            APACHE_USER_UID: ${NEW_UID}
 #            APACHE_USER_GID: ${NEW_GID}
 #
+#            PHP_VERSION: ${PHP_VERSION}
+#
 #            POSTFIX_myhostname: ${PROJECT_HOSTNAME}
 #            POSTFIX_mydestination: ${PROJECT_HOSTNAME}
 #            POSTFIX_relayhost: ${IP_MAILHOG_SERVICE}:1025
diff --git a/local/env.dist b/local/env.dist
@@ -50,7 +50,8 @@ PROJECT_HOSTNAME=yourproject.local
 ###
 ################################################################################
 
-WEB_SERVER=giuseppemorelli/devbox-apache-php:7.2
+WEB_SERVER=giuseppemorelli/devbox-apache-php:7.3
+PHP_VERSION=7.3
 NODEJS_SERVER=node:14
 MYSQL_SERVER=mysql:5.7
 REDIS_SERVER=redis:latest
diff --git a/local/provision/bin/sudo_web_tasks.sh b/local/provision/bin/sudo_web_tasks.sh
@@ -4,13 +4,8 @@ set -e
 
 # apt-get update && apt-get install -y nano
 
-# fix Header may not contain NUL bytes in Unknown on line 0
-# install 2.9 version
-# pecl config-set php_ini  /etc/php/7.3/apache2/php.ini
-# pecl install xdebug
-
-cp /var/www/html/docker/local/config/php/7.2/mods-available/devbox.ini /etc/php/7.2/apache2/conf.d/devbox.ini
-cp /var/www/html/docker/local/config/php/7.2/mods-available/devbox.ini /etc/php/7.2/cli/conf.d/devbox.ini
+cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/apache2/conf.d/devbox.ini
+cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/devbox.ini /etc/php/"$PHP_VERSION"/cli/conf.d/devbox.ini
 
 # set permission to user on temp folder
 chown "$APACHE_USER_UID":"$APACHE_USER_GID" /var/www/html/docker/local/tmp -R
diff --git a/local/provision/bin/sudo_xdebug_from_source.sh b/local/provision/bin/sudo_xdebug_from_source.sh
@@ -14,6 +14,6 @@ make
 make install
 
 # replace xdebug 3 with xdebug 2 config
-cp /var/www/html/docker/local/config/php/7.3/mods-available/xdebug-custom.ini /etc/php/7.3/mods-available/xdebug-custom.ini
-rm /etc/php/7.3/apache2/conf.d/90-xdebug-3.ini
-rm /etc/php/7.3/cli/conf.d/90-xdebug-3.ini
+cp /var/www/html/docker/local/config/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini /etc/php/"$PHP_VERSION"/mods-available/xdebug-custom.ini
+rm /etc/php/"$PHP_VERSION"/apache2/conf.d/90-xdebug-3.ini
+rm /etc/php/"$PHP_VERSION"/cli/conf.d/90-xdebug-3.ini

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ services:`
`27`	`27`	`# APACHE_USER_UID: ${NEW_UID}`
`28`	`28`	`# APACHE_USER_GID: ${NEW_GID}`
`29`	`29`	`#`
	`30`	`+# PHP_VERSION: ${PHP_VERSION}`
	`31`	`+#`
`30`	`32`	`# POSTFIX_myhostname: ${PROJECT_HOSTNAME}`
`31`	`33`	`# POSTFIX_mydestination: ${PROJECT_HOSTNAME}`
`32`	`34`	`# POSTFIX_relayhost: ${IP_MAILHOG_SERVICE}:1025`