Skip to content

Commit f75cfa9

Browse files
committed
fix sonar issuses
1 parent 06b292b commit f75cfa9

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/docker_image_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
id: build-cdk-utils-build-image
2828
run: |
2929
docker build -t "cdk-utils-build:${{ inputs.VERSION_NUMBER }}" -f docker/Dockerfile --build-arg VERSION=${{ inputs.VERSION_NUMBER }} .
30-
docker save "cdk-utils-build:${{ inputs.VERSION_NUMBER }}" -o cdk-utils-build.img
30+
docker save "cdk-utils-build:${{ inputs.VERSION_NUMBER }}" -o cdk-utils-build.img
3131
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@00943011d9042930efac3dcd3a170e4273319bc8
3333
name: Upload docker images
3434
with:
3535
name: docker_artifact

.github/workflows/docker_image_upload.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
secrets:
2222
CDK_PUSH_IMAGE_ROLE:
2323
required: true
24-
24+
2525
jobs:
2626
upload_docker_image:
2727
runs-on: ubuntu-22.04
@@ -60,23 +60,28 @@ jobs:
6060
- name: Retrieve AWS Account ID
6161
id: retrieve-account-id
6262
run: echo "ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)" >> "$GITHUB_ENV"
63-
63+
6464
- name: Login to Amazon ECR
6565
id: login-ecr
6666
run: |
6767
aws ecr get-login-password --region eu-west-2 | docker login --username AWS --password-stdin ${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com
6868
6969
- name: Push tagged version cdk-utils-build to Amazon ECR
70+
env:
71+
VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
72+
DOCKER_IMAGE_TAG: ${{ inputs.DOCKER_IMAGE_TAG }}
7073
run: |
71-
docker tag "cdk-utils-build:${{ inputs.VERSION_NUMBER }}" "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
72-
docker push "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
74+
docker tag "cdk-utils-build:${VERSION_NUMBER}" "${ACCOUNT_ID}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:${DOCKER_IMAGE_TAG}"
75+
docker push "${ACCOUNT_ID}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:${DOCKER_IMAGE_TAG}"
7376
7477
- name: Push latest cdk-utils-build to Amazon ECR
7578
if: ${{ inputs.TAG_LATEST == true }}
79+
env:
80+
VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
7681
run: |
77-
docker tag "cdk-utils-build:${{ inputs.VERSION_NUMBER }}" "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:latest"
78-
docker push "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:latest"
79-
82+
docker tag "cdk-utils-build:${VERSION_NUMBER}" "${ACCOUNT_ID}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:latest"
83+
docker push "${ACCOUNT_ID}.dkr.ecr.eu-west-2.amazonaws.com/cdk-utils-build-repo:latest"
84+
8085
- name: Check cdk-utils-build scan results
8186
env:
8287
REPOSITORY_NAME: cdk-utils-build-repo

0 commit comments

Comments
 (0)