Skip to content

Commit b44a4d1

Browse files
[PRM-495-4] UUID dependency & removal of ECR latest tagging (#273)
* [PRM-495] Moved ehr-out uuid to prod dependency * [PRM-495] Removed 'latest' tagging from ECR * [PRM-495] reintroduced image tag to TAG_ARGS * [PRM-495] reintroduced IMAGE_TAG for node & python workflows * [PRM-495] Removed GIT_REF from ECR tagging * [PRM-495] removed GIT_REF from ECR tagging on Node and Python
1 parent b362571 commit b44a4d1

File tree

5 files changed

+6
-56
lines changed

5 files changed

+6
-56
lines changed

.github/workflows/base-java-service-jobs.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,40 +95,22 @@ jobs:
9595

9696
- name: Docker Build and Tag
9797
env:
98-
REF_NAME: ${{ github.ref_name }}
9998
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
10099
REPOSITORY: ${{inputs.image_prefix}}${{ inputs.service }}
101100
IMAGE_TAG: ${{ github.sha }}
102101
run: |
103102
set -euo pipefail
104-
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
105-
if [ -n "${REF_NAME:-}" ]; then
106-
REF_TAG="${REF_NAME//\//-}"
107-
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
108-
fi
109-
docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
103+
docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .
110104
111105
- name: Docker Publish
112106
if: ${{ inputs.is_deployment }}
113107
env:
114-
REF_NAME: ${{ github.ref_name }}
115108
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
116109
REPOSITORY: ${{ inputs.image_prefix }}${{ inputs.service }}
117110
IMAGE_TAG: ${{ github.sha }}
118111
run: |
119112
set -euo pipefail
120-
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
121-
if [ -n "${REF_NAME:-}" ]; then
122-
REF_TAG="${REF_NAME//\//-}"
123-
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
124-
fi
125113
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
126-
docker push "$REGISTRY/$REPOSITORY:latest"
127-
128-
if [ -n "${REF_NAME:-}" ]; then
129-
REF_TAG="${REF_NAME//\//-}"
130-
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
131-
fi
132114
133115
deploy_infra:
134116
name: Deploy Infrastructure

.github/workflows/base-node-service-jobs.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -128,40 +128,22 @@ jobs:
128128

129129
- name: Docker Build and Tag
130130
env:
131-
REF_NAME: ${{ github.ref_name }}
132131
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
133132
REPOSITORY: deductions/${{ inputs.service }}
134133
IMAGE_TAG: ${{ github.sha }}
135134
run: |
136135
set -euo pipefail
137-
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
138-
if [ -n "${REF_NAME:-}" ]; then
139-
REF_TAG="${REF_NAME//\//-}"
140-
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
141-
fi
142-
docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
136+
docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .
143137
144138
- name: Docker Publish
145139
if: ${{ inputs.is_deployment }}
146140
env:
147-
REF_NAME: ${{ github.ref_name }}
148141
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
149142
REPOSITORY: deductions/${{ inputs.service }}
150143
IMAGE_TAG: ${{ github.sha }}
151144
run: |
152145
set -euo pipefail
153-
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
154-
if [ -n "${REF_NAME:-}" ]; then
155-
REF_TAG="${REF_NAME//\//-}"
156-
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
157-
fi
158146
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
159-
docker push "$REGISTRY/$REPOSITORY:latest"
160-
161-
if [ -n "${REF_NAME:-}" ]; then
162-
REF_TAG="${REF_NAME//\//-}"
163-
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
164-
fi
165147
166148
deploy_infra:
167149
name: Deploy Infrastructure

.github/workflows/base-python-service-jobs.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,18 @@ jobs:
8181
8282
- name: Build Docker Image
8383
env:
84-
REF_NAME: ${{ github.ref_name }}
8584
ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
8685
IMAGE_TAG: ${{ github.sha }}
8786
run: |
88-
TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG" -t "$ECR_URI:latest")
89-
if [ -n "${REF_NAME:-}" ]; then
90-
REF_TAG="${REF_NAME//\//-}"
91-
TAG_ARGS+=(-t "$ECR_URI:$REF_TAG")
92-
fi
93-
docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .
87+
docker build -t "$ECR_URI:$IMAGE_TAG" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .
9488
9589
- name: Push Docker Image
9690
if: ${{ inputs.is_deployment }}
9791
env:
98-
REF_NAME: ${{ github.ref_name }}
9992
ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
10093
IMAGE_TAG: ${{ github.sha }}
10194
run: |
10295
docker push "$ECR_URI:$IMAGE_TAG"
103-
docker push "$ECR_URI:latest"
104-
if [ -n "${GITHUB_REF_NAME:-}" ]; then
105-
REF_TAG="${GITHUB_REF_NAME//\//-}"
106-
docker push "$ECR_URI:$REF_TAG"
107-
fi
10896
10997
deploy_infra:
11098
if: ${{ inputs.deploy_infra && inputs.is_deployment }}

services/ehr-out-service/package-lock.json

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/ehr-out-service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"swagger-ui-express": "^4.3.0",
4343
"traverse": "^0.6.6",
4444
"utils-deep-clone": "^0.0.3",
45+
"uuid": "^8.3.2",
4546
"winston": "^3.6.0",
4647
"xml2js": "^0.5.0"
4748
},
@@ -62,7 +63,6 @@
6263
"nodemon": "^2.0.19",
6364
"prettier": "2.6.0",
6465
"supertest": "^6.3.3",
65-
"uuid": "^8.3.2",
6666
"wait-for-expect": "^3.0.2"
6767
},
6868
"overrides": {

0 commit comments

Comments
 (0)