Revert Docker service name change for wordpress

WordPress · May 22, 2019 · c0836cc · c0836cc
1 parent 87d80ea
commit c0836cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/bin/install-wordpress.sh b/bin/install-wordpress.sh
@@ -11,13 +11,13 @@ set -e
 
 # These are the containers and values for the development site.
 CLI='cli'
-CONTAINER='wordpress_dev'
+CONTAINER='wordpress'
 SITE_TITLE='Gutenberg Dev'
 
 # If we're installing/re-installing the test site, change the containers used.
 if [ "$1" == '--e2e_tests' ]; then
 	CLI="${CLI}_e2e_tests"
-	CONTAINER="wordpress_e2e_tests"
+	CONTAINER='wordpress_e2e_tests'
 	SITE_TITLE='Gutenberg Testing'
 
 	if ! docker ps | grep -q $CONTAINER; then

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,21 +2,20 @@ version: '3.1'
 
 services:
 
-  wordpress_dev:
+  wordpress:
     image: wordpress
     restart: always
     ports:
       - 8888:80
     environment:
       WORDPRESS_DB_HOST: mysql
-      WORDPRESS_DB_NAME: wordpress_dev
       WORDPRESS_DB_PASSWORD: example
       ABSPATH: /usr/src/wordpress/
       WORDPRESS_DEBUG: 1
       WORDPRESS_CONFIG_EXTRA: |
         define( 'SCRIPT_DEBUG', true );
     volumes:
-      - wordpress_dev_data:/var/www/html
+      - wordpress_data:/var/www/html
       - .:/var/www/html/wp-content/plugins/gutenberg
       - ./packages/e2e-tests/plugins:/var/www/html/wp-content/plugins/gutenberg-test-plugins
       - ./packages/e2e-tests/mu-plugins:/var/www/html/wp-content/mu-plugins
@@ -28,11 +27,11 @@ services:
     restart: always
     user: xfs
     volumes:
-      - wordpress_dev_data:/var/www/html
+      - wordpress_data:/var/www/html
       - .:/var/www/html/wp-content/plugins/gutenberg
     depends_on:
       - mysql
-      - wordpress_dev
+      - wordpress
 
   mysql:
     image: mysql:5.7
@@ -92,5 +91,5 @@ services:
 
 volumes:
   testsuite:
-  wordpress_dev_data:
+  wordpress_data:
   wordpress_e2e_tests_data: