Add env files

.gitignore

@@ -14,7 +14,6 @@ node_modules
 # misc
 .DS_Store
 .env.local
-.env
 .env.development.local
 .env.test.local
 .env.production.local

.gitlab-ci.yml

@@ -81,7 +81,7 @@ build_n_test_dashboard:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/accounts:3.0.$CI_PIPELINE_IID ./accounts
     - sudo docker run --env-file ./accounts/.env -p 3003:3003 -d fyipe-project/accounts:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
@@ -228,7 +228,7 @@ build_n_test_statuspage:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/status-page:3.0.$CI_PIPELINE_IID ./status-page
     - sudo docker run -p 3006:3006 -d fyipe-project/status-page:3.0.$CI_PIPELINE_IID
     - sudo docker ps
@@ -279,7 +279,7 @@ desktop_lighthouse_accounts:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/accounts:3.0.$CI_PIPELINE_IID ./accounts
     - sudo docker run -e REACT_APP_PUBLIC_STRIPE_KEY=pk_test_UynUDrFmbBmFVgJXd9EZCvBj00QAVpdwPv -p 3003:3003 -d fyipe-project/accounts:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
@@ -309,7 +309,7 @@ mobile_lighthouse_accounts:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/accounts:3.0.$CI_PIPELINE_IID ./accounts
     - sudo docker run -e REACT_APP_PUBLIC_STRIPE_KEY=pk_test_UynUDrFmbBmFVgJXd9EZCvBj00QAVpdwPv -p 3003:3003 -d fyipe-project/accounts:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
@@ -338,7 +338,7 @@ build_n_test_accounts:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/accounts:3.0.$CI_PIPELINE_IID ./accounts
     - sudo docker run --env-file ./accounts/.env -p 3003:3003 -d fyipe-project/accounts:3.0.$CI_PIPELINE_IID
     - sudo docker build -t fyipe-project/dashboard:3.0.$CI_PIPELINE_IID ./dashboard
@@ -516,7 +516,7 @@ build_n_test_server-monitor:
     - sudo docker run --name mongo -p 27017:27017 -d mongo:3.4
     - sudo docker run --name redis -p 6379:6379 -d redis redis-server
     - sudo docker build -t fyipe-project/backend:3.0.$CI_PIPELINE_IID ./backend
-    - sudo docker run --env-file ./backend/.env.development --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
+    - sudo docker run --env-file ./backend/.env --net=host -d fyipe-project/backend:3.0.$CI_PIPELINE_IID
     - sudo docker ps
     - cd server-monitor
     - npm ci

docker-compose.yml

@@ -18,26 +18,9 @@ services:
     ports:
       - "3002:3002"
     build: ./backend
+    env_file: 
+      - ./backend/.env
     environment: 
-      - MAIL_USER=noreply@fyipe.com
-      - MAIL_PASSWORD=gBote8sHiWpbxGEJo9Puv8cevW
-      - MAIL_RECIPIENT=testmail@fyipe.com
-      - MAIL_RECIPIENT_PASSWORD=66WEPsk4FJCqUnbCFeZrFYCRWg
-      - MAIL_SERVER_SMTP=mail.hackerbay.io
-      - MAIL_PORT_SMTP=587
-      - MAIL_SERVER_IMAP=mail.hackerbay.io
-      - MAIL_PORT_IMAP=993
-      - MAIL_FROM=noreply@fyipe.com
-      - MAIL_SECURE=false
-      - EMAIL_VERIFY_TIME=3600
-      - BACKEND_HOST=http://localhost:3002
-      - ACCOUNTS_HOST=http://localhost:3003
-      - DASHBOARD_HOST=http://localhost:3000
-      - HOME_HOST=http://localhost:1444
-      - NODE_ENV=development
-      - WINDOWMS=216000
-      - MAX=5000
-      - RATE_LIMITING_ENABLED=false
       - MONGO_URL=mongodb://mongo:27017/fyipedb
       - REDIS_HOST=redis
     depends_on:
@@ -48,6 +31,8 @@ services:
     ports:
       - "3003:3003"
     build: ./accounts
+    env_file: 
+      - ./accounts/.env
     depends_on:
       - backend
 
@@ -55,18 +40,24 @@ services:
     ports:
       - "3000:3000"
     build: ./dashboard
+    env_file: 
+      - ./dashboard/.env
     depends_on:
       - backend
 
   home:
     ports:
       - "1444:1444"
+    env_file: 
+      - ./home/.env
     build: ./home
   
   status-page:
     ports:
       - "3006:3006"
     build: ./status-page
+    env_file: 
+      - ./status-page/.env
     depends_on:
       - backend
       - accounts
@@ -75,6 +66,8 @@ services:
   admin-dashboard:
     ports:
       - "3100:3100"
+    env_file: 
+      - ./admin-dashboard/.env
     build: ./dashboard
     depends_on:
       - backend
@@ -83,12 +76,16 @@ services:
   http-test-server:
     ports:
       - "3010:3010"
+    env_file: 
+      - ./http-test-server/.env
     build: ./http-test-server
 
   probe1:
     ports:
       - "3019:3019"
     build: ./probe
+    env_file: 
+      - ./probe/.env
     environment:
       - PORT=3019
       - SERVER_URL=http://backend:3002
@@ -101,6 +98,8 @@ services:
     ports:
       - "3020:3020"
     build: ./probe
+    env_file: 
+      - ./probe/.env
     environment:
       - PORT=3020
       - SERVER_URL=http://backend:3002