Removed dependency on .env file causing issue with Travis CL

.env

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-# See https://docs.docker.com/compose/environment-variables/#the-env-file
-# Nginx
-NGINX_HOST=localhost
-
-# PHP
-# See https://hub.docker.com/r/nanoninja/php-fpm/tags/
-PHP_VERSION=7.2
-
-# MariaDB
-MARIADB_VERSION=10.3.8
-MYSQL_HOST=mysql
-MYSQL_DATABASE=test
-MYSQL_ROOT_USER=root
-MYSQL_ROOT_PASSWORD=root
-MYSQL_USER=dev
-MYSQL_PASSWORD=dev

.travis.yml

@@ -32,13 +32,13 @@ script:
   - docker-compose -f docker-compose.yml ps
   - cd Game
   - cd Databases
-  - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_config.sql
+  - docker exec -i mysql mysql -u"root" -p"root" < openrsc_config.sql
-  - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_logs.sql
+  - docker exec -i mysql mysql -u"root" -p"root" < openrsc_logs.sql
-  - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc.sql
+  - docker exec -i mysql mysql -u"root" -p"root" < openrsc.sql
-  - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_tools.sql
+  - docker exec -i mysql mysql -u"root" -p"root" < openrsc_tools.sql
   - cd ..
   - cd ..
   - cd Website
-  - docker exec -i $(docker-compose ps -q mysqldb) mysql -u"root" -p"root" < openrsc_forum.sql
+  - docker exec -i mysql mysql -u"root" -p"root" < openrsc_forum.sql
   - cd ..
   - sudo ant -f Game/server/build.xml compile

docker-compose.yml

@@ -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_DATABASE=test
-            - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+            - MYSQL_ROOT_PASSWORD=root
-            - MYSQL_USER=${MYSQL_USER}
+            - MYSQL_USER=dev
-            - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+            - MYSQL_PASSWORD=dev
         ports:
             - "3306:3306"
         volumes: