Skip to content

Tt 513 create ci/cd pipeline in timer tracker UI to deploy changes for both environments #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 26 commits into from
Closed

Tt 513 create ci/cd pipeline in timer tracker UI to deploy changes for both environments #832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
62d569b
feat: TT-509 Use terraform to provision ui infraestructure
jatobrun Mar 8, 2022
3fe4e5e
fix: TT-509 expose port 8080 in docker images
jatobrun Mar 10, 2022
6cc64e6
fix: TT-509 change app to port 80
jatobrun Mar 14, 2022
483cf6a
fix: TT-509 including empty line in all files
jatobrun Mar 15, 2022
a4b8426
fix: TT-509 Change the dockerfile to use root user and not app user
jatobrun Mar 16, 2022
da8e769
parent bf8977e79ef18ac85a09f9c55b213c72146c0de7
heikergil Mar 10, 2022
06735a0
fix: TT-513 tests cd-stage.yml
heikergil Mar 16, 2022
09235cf
feat: TT-513 CD - Prod yaml file
santii90ec Mar 16, 2022
d85bbe2
fix: TT-513 tests azure credentials
heikergil Mar 17, 2022
9cce0c9
fix: TT-513 change image tag variable
heikergil Mar 17, 2022
8b6fd37
fix: TT-513 add acr
heikergil Mar 17, 2022
81dae65
fix: TT-513 fix make publish
heikergil Mar 17, 2022
16671fe
fix: TT-513 fix make
heikergil Mar 17, 2022
0e496cc
fix: TT-513 change acr
heikergil Mar 17, 2022
cb9246a
feat: TT-513 cli test and dev test make file
santii90ec Mar 17, 2022
aebce8d
Merge branch 'TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-dep…
santii90ec Mar 17, 2022
b434d10
Merge branch 'TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-dep…
heikergil Mar 17, 2022
dd8f99d
TT-513 fix make publish command
heikergil Mar 17, 2022
fcd887c
fix: TT-513 change registry url
heikergil Mar 17, 2022
4a60730
fix: TT-513 fix registry url
heikergil Mar 17, 2022
15af506
fix: TT-513 test CI/CD pipeline
heikergil Mar 21, 2022
e5a3dd1
fix: TT-513 tests cd/ci make build
heikergil Mar 21, 2022
ab6e6fe
fix: TT-513 test tf init on ci/cd
heikergil Mar 21, 2022
2c6c80f
fix: TT-513 Fix CI on all PR
santii90ec Mar 21, 2022
275642d
fix: TT-513 Fix CI pipeline
santii90ec Mar 21, 2022
779e907
fix: TT-513 Fix Make file for dev testing
santii90ec Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: TT-513 cli test and dev test make file
  • Loading branch information
@santii90ec
santii90ec committed Mar 17, 2022
commit cb9246a9c1ddd5dfa83384a27b4f396beb84aa08
15 changes: 10 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,27 @@ logs: ## Show logs of timetracker_ui.

.PHONY: stop
stop: ## Stop container timetracker_ui.
docker-compose stop
docker-compose stop

.PHONY: restart
restart: ## Restart container timetracker_ui.
docker-compose stop
docker-compose stop
docker-compose up -d

.PHONY: remove
remove: ## Delete container timetracker_ui.
docker-compose down --volumes --remove-orphans --rmi local

.PHONY: test
test: ## Run all tests on docker container timetracker_ui.
docker-compose --env-file ./.env up -d
test: ## Run all tests on docker container timetracker_ui at the CLI.
docker-compose -f docker-compose.yml --env-file ./.env up -d
docker exec -i timetracker_ui bash -c "npm run ci-test"

.PHONY: testdev
testdev: ## Run all tests on docker container timetracker_ui at the Dev
docker-compose -f docker-compose.dev.yml --env-file ./.env up -d
docker exec -it timetracker_ui bash -c "npm run test"

.PHONY: publish
publish: ## Publish the container image timetracker_ui.
docker tag timetracker_ui:latest $(registry_url)/timetracker_ui:latest
Expand All @@ -54,7 +59,7 @@ build_prod: ## Create docker image with dependencies needed for production.

.PHONY: run_prod
run_prod: ## Execute timetracker_ui_prod docker container.
docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod
docker run -d -p 4200:4200 --name timetracker_ui_prod timetracker_ui_prod

.PHONY: remove_prod
remove_prod: ## Delete container timetracker_ui_pro.
Expand Down
18 changes: 9 additions & 9 deletions docler-compose-dev.yml → docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ services:
AUTHORITY_JSON: ${AUTHORITY_JSON}
CLIENT_ID_JSON: ${CLIENT_ID_JSON}
SCOPES_JSON: ${SCOPES_JSON}
# volumes:
# # - ./src:/home/timetracker/time-tracker-ui/src/
# # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
# # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
# # - ./coverage:/home/timetracker/time-tracker-ui/coverage
# # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
# # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
# # - ./package.json:/home/timetracker/time-tracker-ui/package.json
# # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
volumes:
- ./src:/home/timetracker/time-tracker-ui/src/
- ./scripts:/home/timetracker/time-tracker-ui/scripts/
- ./e2e:/home/timetracker/time-tracker-ui/e2e/
- ./coverage:/home/timetracker/time-tracker-ui/coverage
- ./angular.json:/home/timetracker/time-tracker-ui/angular.json
- ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
- ./package.json:/home/timetracker/time-tracker-ui/package.json
- ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js
10 changes: 1 addition & 9 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,4 @@ services:
AUTHORITY_JSON: ${AUTHORITY_JSON}
CLIENT_ID_JSON: ${CLIENT_ID_JSON}
SCOPES_JSON: ${SCOPES_JSON}
# volumes:
# # - ./src:/home/timetracker/time-tracker-ui/src/
# # - ./scripts:/home/timetracker/time-tracker-ui/scripts/
# # - ./e2e:/home/timetracker/time-tracker-ui/e2e/
# # - ./coverage:/home/timetracker/time-tracker-ui/coverage
# # - ./angular.json:/home/timetracker/time-tracker-ui/angular.json
# # - ./karma.conf.js:/home/timetracker/time-tracker-ui/karma.conf.js
# # - ./package.json:/home/timetracker/time-tracker-ui/package.json
# # - ./webpack.config.js:/home/timetracker/time-tracker-ui/webpack.config.js

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build --prod",
"test": "ng test",
"test": "ng test --browsers ChromeHeadless",
"test-headless": "ng test --browsers ChromeHeadless",
"ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",
"lint": "ng lint",
Expand Down