Fix assorted issues in the Docker build process. (#17312)
* Fix assorted issues in the Docker build process. * Correctly add stable tag to tag list.
Austin S. Hemmelgarn committed
Apr 2, 2024 at 09:13 UTC
874b55605268e7ae6617f39019fbe32721768542
2 files changed
+6
-4
.github/scripts/gen-docker-tags.py
+2
@@ -31,4 +31,6 @@ match version:
31
)
32
])
33
34
+ tags = tags + tuple([f'{r}:stable' for r in REPOS])
35
+
36
print(','.join(tags))
.github/workflows/docker.yml
+4
-4
@@ -333,7 +333,7 @@ jobs:
333
- name: Create and Push Manifest
334
id: manifest
335
if: github.repository == 'netdata/netdata'
336
- run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}")"
336
+ run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}")
337
- name: Failure Notification
338
uses: rtCamp/action-slack-notify@v2
339
env:
@@ -489,7 +489,7 @@ jobs:
489
- name: Create and Push Manifest
490
id: manifest
491
if: github.repository == 'netdata/netdata'
492
- run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}")"
492
+ run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}")
493
- name: Failure Notification
494
uses: rtCamp/action-slack-notify@v2
495
env:
@@ -645,7 +645,7 @@ jobs:
645
- name: Create and Push Manifest
646
id: manifest
647
if: github.repository == 'netdata/netdata'
648
- run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}")"
648
+ run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}")
649
- name: Failure Notification
650
uses: rtCamp/action-slack-notify@v2
651
env:
@@ -690,7 +690,7 @@ jobs:
690
repo: netdata/helmchart
691
workflow: Agent Version PR
692
ref: refs/heads/master
693
- inputs: '{"agent_version": "${{ inputs.version }}"}'
693
+ inputs: '{"agent_version": "v${{ inputs.version }}"}'
694
- name: Trigger MSI build
695
if: github.event_name == 'workflow_dispatch' && github.event.inputs.version != 'nightly' && github.repository == 'netdata/netdata'
696
id: trigger-msi