Skip to content

Commit e8b3cdb

Browse files
committed
Fix check for existing image
1 parent 4151e0d commit e8b3cdb

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/build-and-push-image.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@ jobs:
2121
permissions:
2222
id-token: write
2323
outputs:
24-
build-needed: ${{ steps.check-image.outputs.build-needed }}
24+
build-needed: ${{ steps.check-dev-image.outputs.build-needed || steps.check-prod-image.outputs.build-needed }}
2525
steps:
2626
- name: Configure AWS Dev Credentials
2727
uses: aws-actions/configure-aws-credentials@v4
2828
with:
2929
role-to-assume: arn:aws:iam::393416225559:role/GithubDeployMavisAndInfrastructure
3030
aws-region: eu-west-2
3131
- name: Check if dev image exists
32+
id: check-dev-image
3233
run: |
3334
if aws ecr describe-images --repository-name mavis/webapp --image-ids imageTag=${{ inputs.git-sha || github.sha }} > /dev/null 2>&1; then
3435
echo "Dev image with given tag already exists"
3536
else
3637
echo "Dev image does not exist. Build needed"
37-
echo "BUILD_NEEDED=true" >> $GITHUB_ENV
38+
echo "build-needed=true" >> $GITHUB_OUTPUT
3839
fi
3940
- name: Configure AWS Production credentials
4041
if: env.PUSH_IMAGE_TO_PRODUCTION == 'true'
@@ -44,12 +45,12 @@ jobs:
4445
aws-region: eu-west-2
4546
- name: Check if production image exists
4647
if: env.PUSH_IMAGE_TO_PRODUCTION == 'true'
47-
id: check-image
48+
id: check-prod-image
4849
run: |
49-
if [ -e $BUILD_NEEDED ] && aws ecr describe-images --repository-name mavis/webapp --image-ids imageTag=${{ inputs.git-sha || github.sha }} > /dev/null 2>&1; then
50-
echo "Production and dev images with given tag already exist. No build needed"
50+
if aws ecr describe-images --repository-name mavis/webapp --image-ids imageTag=${{ inputs.git-sha || github.sha }} > /dev/null 2>&1; then
51+
echo "Production image with given tag already exists"
5152
else
52-
echo "At least one image does not exist. Build needed"
53+
echo "Production image does not exist. Build needed"
5354
echo "build-needed=true" >> $GITHUB_OUTPUT
5455
fi
5556

0 commit comments

Comments
 (0)