Formatting changes

docker-compose.yml

@@ -7,27 +7,17 @@ services:
          - ~/wordpress/database:/var/lib/mysql
      restart: always
      env_file: ".env"
-#     environment:
-#       - MYSQL_ROOT_PASSWORD=$(MYSQL_ROOT_PASSWORD)
-#       - MYSQL_DATABASE=$(MYSQL_DATABASE)
-#       - MYSQL_USER=$(MYSQL_USER)
-#       - MYSQL_PASSWORD=$(MYSQL_PASSWORD)
 
   wordpress:
     image: wordpress:latest
+    volumes:
+        - ~/wordpress/data:/var/www/html
     depends_on:
         - db
     ports:
         - 8080:80 # change to 80:80 when the shop is ready to go live
     restart: always
     env_file: ".env"
-#    environment:
-#      - WORDPRESS_DB_NAME=${WORDPRESS_DB_NAME}
-#      - WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST}
-#      - WORDPRESS_DB_USER=${WORDPRESS_DB_USER}
-#      - WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD}
-    volumes:
-        - ~/wordpress/data:/var/www/html
 
   wordpress-cli:
     depends_on:
@@ -55,8 +45,3 @@ services:
           - ~/wordpress/data:/var/www/html
     # WP CLI needs the environment variables used for the Wordpress image
     env_file: ".env"
-##    environment:
-##      - WORDPRESS_DB_NAME=${WORDPRESS_DB_NAME}
-##      - WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST}
-##      - WORDPRESS_DB_USER=${WORDPRESS_DB_USER}
-##      - WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD}