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

Robust registry operations: adjust timelimit and use retries #2270

Merged
merged 1 commit into from
Mar 27, 2025
Merged

Robust registry operations: adjust timelimit and use retries #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions .github/workflows/docker-merge-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
timeout-minutes:
description: Timeout in minutes
type: number
default: 25
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These timeouts were too big and almost always it should end in ~6 minutes.
With retry 10 should be enough.

default: 10
secrets:
REGISTRY_USERNAME:
required: true
Expand Down Expand Up @@ -67,9 +67,13 @@ jobs:

- name: Merge tags for the images 🔀
if: env.PUSH_TO_REGISTRY == 'true'
run: >
python3 -m tagging.apps.merge_tags
--image ${{ inputs.image }}
--variant ${{ inputs.variant }}
--tags-dir /tmp/jupyter/tags/
run: |
python3 -m tagging.apps.merge_tags \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit of code duplication, but I don't think that's a huge deal

--image ${{ inputs.image }} \
--variant ${{ inputs.variant }} \
--tags-dir /tmp/jupyter/tags/ || \
python3 -m tagging.apps.merge_tags \
--image ${{ inputs.image }} \
--variant ${{ inputs.variant }} \
--tags-dir /tmp/jupyter/tags/
shell: bash
6 changes: 4 additions & 2 deletions .github/workflows/docker-tag-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
type: string
timeout-minutes:
description: Timeout in minutes
default: 25
default: 10
type: number
secrets:
REGISTRY_USERNAME:
Expand Down Expand Up @@ -75,5 +75,7 @@ jobs:

- name: Push Images to Registry 📤
if: env.PUSH_TO_REGISTRY == 'true'
run: docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}
run: |
docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }} || \
docker push --all-tags ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ inputs.image }}
shell: bash