Formatting changes

podman-compose-env
Mike Holloway 4 months ago
parent 1e093bce98
commit dccccc747a
  1. 30
      docker-compose.yml

@ -7,11 +7,11 @@ 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)
# environment:
# - MYSQL_ROOT_PASSWORD=$(MYSQL_ROOT_PASSWORD)
# - MYSQL_DATABASE=$(MYSQL_DATABASE)
# - MYSQL_USER=$(MYSQL_USER)
# - MYSQL_PASSWORD=$(MYSQL_PASSWORD)
wordpress:
image: wordpress:latest
@ -21,11 +21,11 @@ services:
- 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}
# 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
@ -55,8 +55,8 @@ 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}
## 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}

Loading…
Cancel
Save