Browse Source

Fixed travis builds and made docker-compose a bit more configurable

Owen Diffey 3 years ago
parent
commit
8031cf0bda
3 changed files with 21 additions and 13 deletions
  1. 8 7
      .env.example
  2. 7 4
      .travis.yml
  3. 6 2
      docker-compose.yml

+ 8 - 7
.env.example

@@ -1,18 +1,19 @@
-REDIS_PASSWORD=PASSWORD
+COMPOSE_PROJECT_NAME=musare
 
+BACKEND_HOST=127.0.0.1
 BACKEND_PORT=8080
+
+FRONTEND_HOST=127.0.0.1
 FRONTEND_PORT=80
-HOST=127.0.0.1
+FRONTEND_MODE=dev
 
+MONGO_HOST=127.0.0.1
 MONGO_PORT=27017
 MONGO_ROOT_PASSWORD=PASSWORD_HERE
 MONGO_USER_USERNAME=musare
 MONGO_USER_PASSWORD=OTHER_PASSWORD_HERE
 
-MONGOCLIENT_PORT=3000
-
+REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
+REDIS_PASSWORD=PASSWORD
 
-COMPOSE_PROJECT_NAME=musare
-
-FRONTEND_MODE=dev

+ 7 - 4
.travis.yml

@@ -8,17 +8,20 @@ services:
 
 env:
   global:
-    - REDIS_PASSWORD=PASSWORD
+    - COMPOSE_PROJECT_NAME=musare
+    - BACKEND_HOST=127.0.0.1
     - BACKEND_PORT=8080
+    - FRONTEND_HOST=127.0.0.1
     - FRONTEND_PORT=80
+    - FRONTEND_MODE=dev
+    - MONGO_HOST=127.0.0.1
     - MONGO_PORT=27017
     - MONGO_ROOT_PASSWORD=PASSWORD_HERE
     - MONGO_USER_USERNAME=musare
     - MONGO_USER_PASSWORD=OTHER_PASSWORD_HERE
-    - MONGOCLIENT_PORT=3000
+    - REDIS_HOST=127.0.0.1
     - REDIS_PORT=6379
-    - COMPOSE_PROJECT_NAME=musare
-    - FRONTEND_MODE=prod
+    - REDIS_PASSWORD=PASSWORD
 
 before_install:
   # create config files from template

+ 6 - 2
docker-compose.yml

@@ -4,7 +4,7 @@ services:
   backend:
     build: ./backend
     ports:
-      - "${HOST}:${BACKEND_PORT}:8080"
+      - "${BACKEND_HOST}:${BACKEND_PORT}:8080"
     volumes:
       - ./backend:/opt/app
       - ./log:/opt/log
@@ -17,7 +17,7 @@ services:
   frontend:
     build: ./frontend
     ports:
-      - "${HOST}:${FRONTEND_PORT}:80"
+      - "${FRONTEND_HOST}:${FRONTEND_PORT}:80"
     volumes:
       - ./frontend:/opt/app
       - /opt/app/node_modules/
@@ -26,6 +26,8 @@ services:
 
   mongo:
     image: mongo:4.0
+    ports:
+      - "${MONGO_HOST}:${MONGO_PORT}:${MONGO_PORT}"
     environment:
       - MONGO_INITDB_ROOT_USERNAME=admin
       - MONGO_INITDB_ROOT_PASSWORD=${MONGO_ROOT_PASSWORD}
@@ -40,6 +42,8 @@ services:
 
   redis:
     image: redis
+    ports:
+      - "${REDIS_HOST}:${REDIS_PORT}:6379"
     command: "--notify-keyspace-events Ex --requirepass ${REDIS_PASSWORD} --appendonly yes"
     volumes:
       - .redis:/data