Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 1 addition & 19 deletions .github/workflows/base-java-service-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,40 +95,22 @@ jobs:

- name: Docker Build and Tag
env:
REF_NAME: ${{ github.ref_name }}
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
REPOSITORY: ${{inputs.image_prefix}}${{ inputs.service }}
IMAGE_TAG: ${{ github.sha }}
run: |
set -euo pipefail
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
fi
docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .

- name: Docker Publish
if: ${{ inputs.is_deployment }}
env:
REF_NAME: ${{ github.ref_name }}
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
REPOSITORY: ${{ inputs.image_prefix }}${{ inputs.service }}
IMAGE_TAG: ${{ github.sha }}
run: |
set -euo pipefail
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
fi
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
docker push "$REGISTRY/$REPOSITORY:latest"

if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
fi

deploy_infra:
name: Deploy Infrastructure
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/base-node-service-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,40 +128,22 @@ jobs:

- name: Docker Build and Tag
env:
REF_NAME: ${{ github.ref_name }}
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
REPOSITORY: deductions/${{ inputs.service }}
IMAGE_TAG: ${{ github.sha }}
run: |
set -euo pipefail
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
fi
docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" .
docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" .

- name: Docker Publish
if: ${{ inputs.is_deployment }}
env:
REF_NAME: ${{ github.ref_name }}
REGISTRY: ${{ steps.ecr-login.outputs.registry }}
REPOSITORY: deductions/${{ inputs.service }}
IMAGE_TAG: ${{ github.sha }}
run: |
set -euo pipefail
TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest")
if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG")
fi
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
docker push "$REGISTRY/$REPOSITORY:latest"

if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
docker push "$REGISTRY/$REPOSITORY:$REF_TAG"
fi

deploy_infra:
name: Deploy Infrastructure
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/base-python-service-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,30 +81,18 @@ jobs:

- name: Build Docker Image
env:
REF_NAME: ${{ github.ref_name }}
ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
IMAGE_TAG: ${{ github.sha }}
run: |
TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG" -t "$ECR_URI:latest")
if [ -n "${REF_NAME:-}" ]; then
REF_TAG="${REF_NAME//\//-}"
TAG_ARGS+=(-t "$ECR_URI:$REF_TAG")
fi
docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .
docker build -t "$ECR_URI:$IMAGE_TAG" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} .

- name: Push Docker Image
if: ${{ inputs.is_deployment }}
env:
REF_NAME: ${{ github.ref_name }}
ECR_URI: ${{ steps.ecr-repo.outputs.uri }}
IMAGE_TAG: ${{ github.sha }}
run: |
docker push "$ECR_URI:$IMAGE_TAG"
docker push "$ECR_URI:latest"
if [ -n "${GITHUB_REF_NAME:-}" ]; then
REF_TAG="${GITHUB_REF_NAME//\//-}"
docker push "$ECR_URI:$REF_TAG"
fi

deploy_infra:
if: ${{ inputs.deploy_infra && inputs.is_deployment }}
Expand Down
6 changes: 2 additions & 4 deletions services/ehr-out-service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion services/ehr-out-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"swagger-ui-express": "^4.3.0",
"traverse": "^0.6.6",
"utils-deep-clone": "^0.0.3",
"uuid": "^8.3.2",
"winston": "^3.6.0",
"xml2js": "^0.5.0"
},
Expand All @@ -62,7 +63,6 @@
"nodemon": "^2.0.19",
"prettier": "2.6.0",
"supertest": "^6.3.3",
"uuid": "^8.3.2",
"wait-for-expect": "^3.0.2"
},
"overrides": {
Expand Down
Loading