Merge pull request #20 from jodumont/master

PR :)
This commit is contained in:
Michael J. Stealey
2019-02-05 11:10:51 -05:00
committed by GitHub
3 changed files with 11 additions and 8 deletions
+3 -4
View File
@@ -1,15 +1,14 @@
PASSWORD=password
# wordpress - wordpress:php7.3-fpm
WORDPRESS_DB_NAME=wordpress
WORDPRESS_TABLE_PREFIX=wp_
WORDPRESS_DB_HOST=mysql
WORDPRESS_DB_USER=root
WORDPRESS_DB_PASSWORD=password
# mariadb - mariadb:latest
MYSQL_ROOT_PASSWORD=password
MYSQL_USER=root
MYSQL_PASSWORD=password
MYSQL_DATABASE=wordpress
# nginx - nginx:latest
NGINX_DEFAULT_CONF=./nginx/default.conf
NGINX_DEFAULT_CONF=./nginx/default.conf
+5 -1
View File
@@ -1,6 +1,10 @@
.env*
.idea/
certs/
certs-data/
logs/
nginx/
mysql/
wordpress/
wordpress/
!.env_example
!nginx/default*
+3 -3
View File
@@ -11,7 +11,7 @@ services:
- WORDPRESS_TABLE_PREFIX=${WORDPRESS_TABLE_PREFIX:-wp_}
- WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST:-mysql}
- WORDPRESS_DB_USER=${WORDPRESS_DB_USER:-root}
- WORDPRESS_DB_PASSWORD=${WORDPRESS_DB_PASSWORD:-password}
- WORDPRESS_DB_PASSWORD=${PASSWORD:-password}
depends_on:
- mysql
restart: always
@@ -22,9 +22,9 @@ services:
volumes:
- ./mysql:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-password}
- MYSQL_ROOT_PASSWORD=${PASSWORD:-password}
- MYSQL_USER=${MYSQL_USER:-root}
- MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
- MYSQL_PASSWORD=${PASSWORD:-password}
- MYSQL_DATABASE=${MYSQL_DATABASE:-wordpress}
restart: always