Skip to content

Commit 5cfcdbd

Browse files
authored
Robust registry operations: adjust timelimit and use retries (#2270)
1 parent ecaa90c commit 5cfcdbd

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/docker-merge-tags.yml

+10-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
timeout-minutes:
1919
description: Timeout in minutes
2020
type: number
21-
default: 25
21+
default: 10
2222
secrets:
2323
REGISTRY_USERNAME:
2424
required: true
@@ -67,9 +67,13 @@ jobs:
6767

6868
- name: Merge tags for the images 🔀
6969
if: env.PUSH_TO_REGISTRY == 'true'
70-
run: >
71-
python3 -m tagging.apps.merge_tags
72-
--image ${{ inputs.image }}
73-
--variant ${{ inputs.variant }}
74-
--tags-dir /tmp/jupyter/tags/
70+
run: |
71+
python3 -m tagging.apps.merge_tags \
72+
--image ${{ inputs.image }} \
73+
--variant ${{ inputs.variant }} \
74+
--tags-dir /tmp/jupyter/tags/ || \
75+
python3 -m tagging.apps.merge_tags \
76+
--image ${{ inputs.image }} \
77+
--variant ${{ inputs.variant }} \
78+
--tags-dir /tmp/jupyter/tags/
7579
shell: bash

.github/workflows/docker-tag-push.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
type: string
2323
timeout-minutes:
2424
description: Timeout in minutes
25-
default: 25
25+
default: 10
2626
type: number
2727
secrets:
2828
REGISTRY_USERNAME:
@@ -75,5 +75,7 @@ jobs:
7575

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

0 commit comments

Comments
 (0)