Skip to content

Commit 15ea67a

Browse files
committed
fixing issues with tags
1 parent 5283c3c commit 15ea67a

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

.github/workflows/publish.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88

99
env:
10-
ECR_REPOSITORY_URI: ${{ secrets.AWS_ECR_ACCOUNT }}.dkr.ecr.eu-west-1.amazonaws.com/${{ secrets.ECR_REPOSITORY }}
10+
ECR_REPOSITORY_URI: 727618530289.dkr.ecr.eu-west-1.amazonaws.com/saleor-mcp
1111

1212
jobs:
1313
prepare-variables:
@@ -16,8 +16,9 @@ jobs:
1616
permissions:
1717
contents: read
1818
outputs:
19-
image_tags: ${{ steps.generate_image_tags.outputs.image_tags }}
19+
default_image_uri: ${{ steps.generate_image_tags.outputs.default_image_uri }}
2020
unique_image_tag: ${{ steps.generate_image_tags.outputs.unique_image_tag }}
21+
unique_image_uri: ${{ steps.generate_image_tags.outputs.unique_image_uri }}
2122
ecr_repo_uri: ${{ steps.generate_image_tags.outputs.ecr_repo_uri }}
2223
steps:
2324
# Required by generate_image_tags
@@ -30,14 +31,22 @@ jobs:
3031
IMAGE_REPOSITORY: ${{ env.ECR_REPOSITORY_URI }}
3132
BRANCH_IMAGE_TAG: ${{ github.ref_name }}
3233
run: |
33-
unique_image_tag="${BRANCH_IMAGE_TAG}-$(git rev-parse --short HEAD)"
34+
default_image_uri="${IMAGE_REPOSITORY}:${BRANCH_IMAGE_TAG}"
3435
35-
image_tags="${IMAGE_REPOSITORY}:${BRANCH_IMAGE_TAG},${IMAGE_REPOSITORY}:${unique_image_tag}"
36+
unique_image_tag="${BRANCH_IMAGE_TAG}-$(git rev-parse --short HEAD)"
37+
unique_image_uri="${IMAGE_REPOSITORY}:${unique_image_tag}"
3638
39+
echo "default_image_uri=${default_image_uri}" >> $GITHUB_OUTPUT
3740
echo "unique_image_tag=${unique_image_tag}" >> $GITHUB_OUTPUT
38-
echo "image_tags=${image_tags}" >> $GITHUB_OUTPUT
41+
echo "unique_image_uri=${unique_image_uri}" >> $GITHUB_OUTPUT
3942
echo "ecr_repo_uri=${IMAGE_REPOSITORY}" >> $GITHUB_OUTPUT
4043
44+
- name: Debug image tags
45+
run: |
46+
echo "default_image_uri: ${{ steps.generate_image_tags.outputs.default_image_uri }}"
47+
echo "unique_image_tag: ${{ steps.generate_image_tags.outputs.unique_image_tag }}"
48+
echo "unique_image_uri: ${{ steps.generate_image_tags.outputs.unique_image_uri }}"
49+
echo "ecr_repo_uri: ${{ steps.generate_image_tags.outputs.ecr_repo_uri }}"
4150
4251
build-push:
4352
needs: prepare-variables
@@ -52,14 +61,16 @@ jobs:
5261
enable-aws-ecr: true
5362
aws-ecr-region: eu-west-1
5463
oci-full-repository: ${{ needs.prepare-variables.outputs.ecr_repo_uri }}
55-
tags: ${{ needs.prepare-variables.outputs.image_tags }}
64+
tags: |
65+
${{ needs.prepare-variables.outputs.default_image_uri }}
66+
${{ needs.prepare-variables.outputs.unique_image_uri }}
5667
5768
amd64-runner-image: ubuntu-24.04
5869
arm64-runner-image: ubuntu-24.04-arm
5970

6071
secrets:
6172
aws-ecr-role-to-assume: arn:aws:iam::${{ secrets.AWS_STAGING_ACCOUNT_ID }}:role/${{ secrets.AWS_APPS_SALEOR_MCP_STAGING_CICD_ROLE_NAME }}
62-
aws-ecr-registries: ${{ secrets.AWS_ECR_ACCOUNT }}
73+
aws-ecr-registries: "727618530289"
6374

6475
deploy:
6576
needs: [prepare-variables, build-push]

0 commit comments

Comments
 (0)