Make adjusts into docker-compose file and make file to execute test

Author: sbateca

Docker/test.Dockerfile

@@ -42,4 +42,7 @@ USER ${USERNAME}
 RUN npm cache clean --force && npm install
 EXPOSE 4200
 EXPOSE 9876
-CMD npm run config && npm run test
+
+FROM development as build
+COPY .env .
+RUN npm run config && npm run test

Makefile

@@ -40,8 +40,7 @@ remove: ## Delete container timetracker_ui.
 
 .PHONY: test
 test: ## Run all tests on docker container timetracker_ui at the CLI.
-	docker-compose build timetracker_ui
-	docker-compose up -d timetracker_ui
+	docker-compose up -d timetracker_ui_test
 	docker exec timetracker_ui bash -c "npm run ci-test"
 
 .PHONY: testdev

docker-compose.yml

@@ -26,7 +26,6 @@ services:
     container_name: timetracker_ui_prod
     image: timetracker_ui_prod
     build:
-      # target: production
       context: .
       dockerfile: ./Docker/prod.Dockerfile
     ports:
@@ -45,17 +44,11 @@ services:
       SCOPES_JSON: ${SCOPES_JSON}
 
   timetracker_ui_test:
-    container_name: timetracker_ui_test
+    container_name: timetracker_ui
     image: timetracker_ui
     build:
-      # target: production
       context: .
-      dockerfile:
-        ./Docker/dev.Dockerfile
-        ./Docker/test.Dockerfile
-    ports:
-      - 4200:4200
-      - 9876:9876
+      dockerfile: ./Docker/test.Dockerfile
     environment:
       CHROME_BIN: /opt/google/chrome/google-chrome
       AUTHORITY: ${AUTHORITY}
@@ -66,5 +59,4 @@ services:
       AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
       AUTHORITY_JSON: ${AUTHORITY_JSON}
       CLIENT_ID_JSON: ${CLIENT_ID_JSON}
-      SCOPES_JSON: ${SCOPES_JSON}
-
+      SCOPES_JSON: ${SCOPES_JSON}