Removed dependency on .env file causing issue with Travis CL

This commit is contained in:
Marwolf
2018-07-31 15:42:30 -04:00
parent 345499d5f5
commit 08f44f7821
3 changed files with 12 additions and 31 deletions

View File

@@ -16,7 +16,7 @@ services:
- "80:80"
- "443:443"
environment:
- NGINX_HOST=${NGINX_HOST}
- NGINX_HOST=localhost
command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
restart: always
depends_on:
@@ -32,7 +32,7 @@ services:
# labels: "Nginx"
php:
image: nanoninja/php-fpm:${PHP_VERSION}
image: nanoninja/php-fpm:7.2
container_name: php
restart: always
volumes:
@@ -68,17 +68,16 @@ services:
# labels: "PHPMyAdmin"
mysqldb:
image: mariadb:${MARIADB_VERSION}
image: mariadb:10.3.8
container_name: mysql
container_name: ${MYSQL_HOST}
restart: always
env_file:
- ".env"
environment:
- MYSQL_DATABASE=${MYSQL_DATABASE}
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
- MYSQL_USER=${MYSQL_USER}
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_DATABASE=test
- MYSQL_ROOT_PASSWORD=root
- MYSQL_USER=dev
- MYSQL_PASSWORD=dev
ports:
- "3306:3306"
volumes: