diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2024-04-02 09:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-02 09:13:10 -0400 |
| commit | 874b55605268e7ae6617f39019fbe32721768542 (patch) | |
| tree | 7c516ccf034a317f3cd1a9ca205883571d144608 | |
| parent | 926956efc8f3126307a0ba54900ee3e15ec67647 (diff) | |
Fix assorted issues in the Docker build process. (#17312)
* Fix assorted issues in the Docker build process.
* Correctly add stable tag to tag list.
| -rwxr-xr-x | .github/scripts/gen-docker-tags.py | 2 | ||||
| -rw-r--r-- | .github/workflows/docker.yml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.github/scripts/gen-docker-tags.py b/.github/scripts/gen-docker-tags.py index c45b991d90..f60e1cd41b 100755 --- a/.github/scripts/gen-docker-tags.py +++ b/.github/scripts/gen-docker-tags.py @@ -31,4 +31,6 @@ match version: ) ]) + tags = tags + tuple([f'{r}:stable' for r in REPOS]) + print(','.join(tags)) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0324071f66..dfe6207c3e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -333,7 +333,7 @@ jobs: - name: Create and Push Manifest id: manifest if: github.repository == 'netdata/netdata' - run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}")" + run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests '' "${{ needs.gen-tags.outputs.tags }}") - name: Failure Notification uses: rtCamp/action-slack-notify@v2 env: @@ -489,7 +489,7 @@ jobs: - name: Create and Push Manifest id: manifest if: github.repository == 'netdata/netdata' - run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}")" + run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'quay.io' "${{ needs.gen-tags.outputs.tags }}") - name: Failure Notification uses: rtCamp/action-slack-notify@v2 env: @@ -645,7 +645,7 @@ jobs: - name: Create and Push Manifest id: manifest if: github.repository == 'netdata/netdata' - run: docker buildx imagetools create "$(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}")" + run: docker buildx imagetools create $(.github/scripts/gen-docker-imagetool-args.py /tmp/digests 'ghcr.io' "${{ needs.gen-tags.outputs.tags }}") - name: Failure Notification uses: rtCamp/action-slack-notify@v2 env: @@ -690,7 +690,7 @@ jobs: repo: netdata/helmchart workflow: Agent Version PR ref: refs/heads/master - inputs: '{"agent_version": "${{ inputs.version }}"}' + inputs: '{"agent_version": "v${{ inputs.version }}"}' - name: Trigger MSI build if: github.event_name == 'workflow_dispatch' && github.event.inputs.version != 'nightly' && github.repository == 'netdata/netdata' id: trigger-msi |