Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fix for PR 422 #423

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Minor fix for PR 422 #423

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
605d71c
Minor fix
dwertent Nov 9, 2024
b60ddcd
Merge branch 'main' into fix-422
dwertent Nov 11, 2024
9fb342c
Merge branch 'main' into fix-422
dwertent Nov 11, 2024
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
29 changes: 9 additions & 20 deletions .github/workflows/cross-build-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,15 @@ jobs:
password: ${{ secrets.password }}

- name: Create and push core manifest
run: |
docker manifest create $TEMP_IMAGE \
--amend $TEMP_IMAGE-arm64 \
--amend $TEMP_IMAGE-amd64
docker manifest push $TEMP_IMAGE

- name: Retag and push core image
env:
IMAGE_TAGS: ${{ inputs.image_tags }}
run: |
docker pull $TEMP_IMAGE
IFS=',' read -ra TAG_ARRAY <<< "$IMAGE_TAGS"
for tag in "${TAG_ARRAY[@]}"; do
docker tag $TEMP_IMAGE $IMAGE:$tag
docker push $IMAGE:$tag
docker manifest create $IMAGE:$tag \
--amend $TEMP_IMAGE-arm64 \
--amend $TEMP_IMAGE-amd64
docker manifest push $IMAGE:$tag
done

operator-docker-manifest:
Expand Down Expand Up @@ -149,19 +143,14 @@ jobs:
password: ${{ secrets.password }}

- name: Create and push operator manifest
run: |
docker manifest create $TEMP_IMAGE \
--amend $TEMP_IMAGE-arm64 \
--amend $TEMP_IMAGE-amd64
docker manifest push $TEMP_IMAGE

- name: Retag and push operator image
env:
IMAGE_TAGS: ${{ inputs.image_tags }}
run: |
docker pull $TEMP_IMAGE
IFS=',' read -ra TAG_ARRAY <<< "$IMAGE_TAGS"
for tag in "${TAG_ARRAY[@]}"; do
docker tag $TEMP_IMAGE $IMAGE:$tag
docker push $IMAGE:$tag
docker manifest create $IMAGE:$tag \
--amend $TEMP_IMAGE-arm64 \
--amend $TEMP_IMAGE-amd64
docker manifest push $IMAGE:$tag
done