Rename PHP_IMAGE to PHP_VERSION

Author: ravichdev

.env.dist

@@ -5,13 +5,9 @@ MYSQL_USER=wordpress
 MYSQL_PASSWORD=wordpress
 
 # WordPress
-if [ -z "$WP_VERSION" ]; then
-    WP_VERSION=5.6
-fi
+WP_VERSION=5.6
 WP_DB_USER=wordpress
 WP_DB_PASSWORD=wordpress
 
 # PHP
-if [ -z "$PHP_IMAGE" ]; then
-    PHP_IMAGE=php7.4-apache
-fi
+PHP_VERSION=php7.4-apache

.travis.yml

@@ -104,7 +104,7 @@ jobs:
 
     - name: E2E tests with Docker (7.3, WordPress 5.2)
       php: "7.3"
-      env: NODE_ENV=teste2e PHP_IMAGE=php7.3-apache WP_VERSION=5.2
+      env: NODE_ENV=teste2e PHP_VERSION=php7.3-apache WP_VERSION=5.2
       before_install:
         - unset PUPPETEER_SKIP_CHROMIUM_DOWNLOAD
         - nvm install

bin/local-dev/wordpress/Dockerfile

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 ARG WP_VERSION
-ARG PHP_IMAGE
+ARG PHP_VERSION
 
-FROM wordpress:${WP_VERSION}-${PHP_IMAGE}
+FROM wordpress:${WP_VERSION}-${PHP_VERSION}
 
 ENV NODE_VERSION 10.18.1
 ENV YARN_VERSION 1.21.1

docker-compose.yml

@@ -35,7 +35,7 @@ services:
       context: ./bin/local-dev/wordpress
       args:
         WP_VERSION: ${WP_VERSION}
-        PHP_IMAGE: ${PHP_IMAGE}
+        PHP_VERSION: ${PHP_VERSION}
     depends_on:
       - mysql
     ports: