updated docker compose

tmcclung · tmcclung · commit 9e5c8d51d92a · 2019-10-07T12:26:02.000-07:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,10 +12,10 @@ services:
       - wpdevnet
 
     ports:
-      - ${LOCAL_PORT-8889}:80
+      - 8889:80
 
     environment:
-      LOCAL_DIR: ${LOCAL_DIR-src}
+      LOCAL_DIR: src
 
     volumes:
       - ./tools/local-env/default.template:/etc/nginx/conf.d/default.template
@@ -31,16 +31,16 @@ services:
   # The PHP container.
   ##
   php:
-    image: wordpressdevelop/php:${LOCAL_PHP-latest}
+    image: wordpressdevelop/php:latest
 
     networks:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      LOCAL_PHP_XDEBUG: false
+      LOCAL_PHP_MEMCACHED: false
+      PHP_FPM_UID: 1000
+      PHP_FPM_GID: 1000
 
     volumes:
       - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini
@@ -53,7 +53,7 @@ services:
   # The MySQL container.
   ##
   mysql:
-    image: mysql:${LOCAL_MYSQL-latest}
+    image: mysql:latest
 
     networks:
       - wpdevnet
@@ -72,16 +72,16 @@ services:
   # The WP CLI container.
   ##
   cli:
-    image: wordpressdevelop/cli:${LOCAL_PHP-latest}
+    image: wordpressdevelop/cli:latest
 
     networks:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      LOCAL_PHP_XDEBUG: false
+      LOCAL_PHP_MEMCACHED: false
+      PHP_FPM_UID: 1000
+      PHP_FPM_GID: 1000
 
     volumes:
       - ./:/var/www
@@ -93,23 +93,23 @@ services:
   # The PHPUnit container.
   ##
   phpunit:
-    image: wordpressdevelop/phpunit:${LOCAL_PHP-latest}
+    image: wordpressdevelop/phpunit:latest
 
     networks:
       - wpdevnet
 
     environment:
-      LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
-      LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
-      LOCAL_DIR: ${LOCAL_DIR-src}
-      WP_MULTISITE: ${WP_MULTISITE-false}
-      PHP_FPM_UID: ${PHP_FPM_UID-1000}
-      PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      LOCAL_PHP_XDEBUG: false
+      LOCAL_PHP_MEMCACHED: false
+      LOCAL_DIR: src
+      WP_MULTISITE: false
+      PHP_FPM_UID: 1000
+      PHP_FPM_GID: 1000
 
     volumes:
       - ./tools/local-env/phpunit-config.ini:/usr/local/etc/php/conf.d/phpunit-config.ini
       - ./:/var/www
-      - phpunit-uploads:/var/www/${LOCAL_DIR-src}/wp-content/uploads
+      - phpunit-uploads:/var/www/src/wp-content/uploads
 
     # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
     init: true
