Merge branch 'develop' into feature/error-handle

xwp · Apr 16, 2020 · 029eed2 · 029eed2
2 parents 9ead265 + 30aa983
commit 029eed2
Show file tree

Hide file tree

Showing 7 changed files with 292 additions and 74 deletions.
diff --git a/.env.dist b/.env.dist
@@ -13,3 +13,6 @@ MYSQL_PASSWORD=wordpress
 WP_VERSION=5.3.2
 WP_DB_USER=wordpress
 WP_DB_PASSWORD=wordpress
+
+# PHP
+PHP_VERSION=php7.4-apache
diff --git a/bin/local-dev/wordpress/Dockerfile b/bin/local-dev/wordpress/Dockerfile
@@ -1,6 +1,7 @@
 ARG WP_VERSION
+ARG PHP_VERSION
 
-FROM wordpress:${WP_VERSION}-php7.4-apache
+FROM wordpress:${WP_VERSION}-${PHP_VERSION}
 
 ENV NODE_VERSION 10.18.1
 ENV YARN_VERSION 1.21.1