File tree Expand file tree Collapse file tree 4 files changed +21
-24
lines changed Expand file tree Collapse file tree 4 files changed +21
-24
lines changed Original file line number Diff line number Diff line change @@ -27,22 +27,27 @@ logs: ## Show logs of timetracker_ui.
27
27
28
28
.PHONY : stop
29
29
stop : # # Stop container timetracker_ui.
30
- docker-compose stop
30
+ docker-compose stop
31
31
32
32
.PHONY : restart
33
33
restart : # # Restart container timetracker_ui.
34
- docker-compose stop
34
+ docker-compose stop
35
35
docker-compose up -d
36
36
37
37
.PHONY : remove
38
38
remove : # # Delete container timetracker_ui.
39
39
docker-compose down --volumes --remove-orphans --rmi local
40
40
41
41
.PHONY : test
42
- test : # # Run all tests on docker container timetracker_ui.
43
- docker-compose --env-file ./.env up -d
42
+ test : # # Run all tests on docker container timetracker_ui at the CLI .
43
+ docker-compose -f docker-compose.yml - -env-file ./.env up -d
44
44
docker exec -i timetracker_ui bash -c " npm run ci-test"
45
45
46
+ .PHONY : testdev
47
+ testdev : # # Run all tests on docker container timetracker_ui at the Dev
48
+ docker-compose -f docker-compose.dev.yml --env-file ./.env up -d
49
+ docker exec -it timetracker_ui bash -c " npm run test"
50
+
46
51
.PHONY : publish
47
52
publish : # # Publish the container image timetracker_ui.
48
53
docker tag timetracker_ui:latest $(registry_url ) /timetracker_ui:latest
@@ -54,7 +59,7 @@ build_prod: ## Create docker image with dependencies needed for production.
54
59
55
60
.PHONY : run_prod
56
61
run_prod : # # Execute timetracker_ui_prod docker container.
57
- docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
62
+ docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
58
63
59
64
.PHONY : remove_prod
60
65
remove_prod : # # Delete container timetracker_ui_pro.
Original file line number Diff line number Diff line change @@ -21,12 +21,12 @@ services:
21
21
AUTHORITY_JSON : ${AUTHORITY_JSON}
22
22
CLIENT_ID_JSON : ${CLIENT_ID_JSON}
23
23
SCOPES_JSON : ${SCOPES_JSON}
24
- # volumes:
25
- # # - ./src:/home/timetracker/time-tracker-ui/src/
26
- # # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
27
- # # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
28
- # # - ./coverage:/home/timetracker/time-tracker-ui/coverage
29
- # # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30
- # # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31
- # # - ./package.json:/home/timetracker/time-tracker-ui/package.json
32
- # # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
24
+ volumes :
25
+ - ./src:/home/timetracker/time-tracker-ui/src/
26
+ - ./scripts:/home/timetracker/time-tracker-ui/scripts/
27
+ - ./e2e:/home/timetracker/time-tracker-ui/e2e/
28
+ - ./coverage:/home/timetracker/time-tracker-ui/coverage
29
+ - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30
+ - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31
+ - ./package.json:/home/timetracker/time-tracker-ui/package.json
32
+ - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
Original file line number Diff line number Diff line change @@ -21,12 +21,4 @@ services:
21
21
AUTHORITY_JSON : ${AUTHORITY_JSON}
22
22
CLIENT_ID_JSON : ${CLIENT_ID_JSON}
23
23
SCOPES_JSON : ${SCOPES_JSON}
24
- # volumes:
25
- # # - ./src:/home/timetracker/time-tracker-ui/src/
26
- # # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
27
- # # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
28
- # # - ./coverage:/home/timetracker/time-tracker-ui/coverage
29
- # # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
30
- # # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
31
- # # - ./package.json:/home/timetracker/time-tracker-ui/package.json
32
- # # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
24
+
Original file line number Diff line number Diff line change 7
7
"ng" : " ng" ,
8
8
"start" : " ng serve" ,
9
9
"build" : " ng build --prod" ,
10
- "test" : " ng test" ,
10
+ "test" : " ng test --browsers ChromeHeadless " ,
11
11
"test-headless" : " ng test --browsers ChromeHeadless" ,
12
12
"ci-test" : " ng test --no-watch --no-progress --browsers ChromeHeadless" ,
13
13
"lint" : " ng lint" ,
You can’t perform that action at this time.
0 commit comments