Skip to content

Commit 9bd67e5

Browse files
committed
fix: TT-513 Fix CI pipeline
1 parent b732dc4 commit 9bd67e5

File tree

4 files changed

+5
-24
lines changed

4 files changed

+5
-24
lines changed

.github/workflows/time-tracker-ui-cd-stage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: time-tracker-ui-cd-stage
22

33
on:
44
push:
5-
branches:
6-
- TT-513-Create-CI/CD-pipeline-in-timer-tracker-ui-to-deploy-changes-for-both-environments
5+
tags:
6+
- 'v*.*.*'
77

88
jobs:
99
cd:

.github/workflows/time-tracker-ui-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Terraform Plan Stage
7979
id: plan-stage
8080
if: github.event_name == 'pull_request'
81-
run: terraform plan -var-file=${{ env.TF_WORKSPACE }}.tfvars -no-color
81+
run: terraform plan -var-file=${{ env.TF_WORKSPACE }}.tfvars -var image_tag=latest -no-color
8282
continue-on-error: true
8383
working-directory: ./${{ env.WORKING_DIR }}
8484
env:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test: ## Run all tests on docker container timetracker_ui at the CLI.
4545

4646
.PHONY: testdev
4747
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
48+
docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file ./.env up -d
4949
docker exec -it timetracker_ui bash -c "npm run test"
5050

5151
.PHONY: publish

docker-compose.dev.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,7 @@
11
version: '3.9'
22
services:
33
time-tracker-ui:
4-
container_name: timetracker_ui
5-
image: timetracker_ui
6-
build:
7-
target: development
8-
context: .
9-
dockerfile: ./Dockerfile
10-
ports:
11-
- 4200:4200
12-
- 9876:9876
13-
environment:
14-
CHROME_BIN: /opt/google/chrome/google-chrome
15-
AUTHORITY: ${AUTHORITY}
16-
CLIENT_ID: ${CLIENT_ID}
17-
SCOPES: ${SCOPES}
18-
STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
19-
STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
20-
AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
21-
AUTHORITY_JSON: ${AUTHORITY_JSON}
22-
CLIENT_ID_JSON: ${CLIENT_ID_JSON}
23-
SCOPES_JSON: ${SCOPES_JSON}
4+
user: root
245
volumes:
256
- ./src:/home/timetracker/time-tracker-ui/src/
267
- ./scripts:/home/timetracker/time-tracker-ui/scripts/

0 commit comments

Comments
 (0)