Merge branch 'master' into remove-first

This commit is contained in:
Ben Meadors 2025-01-23 17:13:23 -06:00 committed by GitHub
commit fa163575e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -128,9 +128,14 @@ jobs:
} }
} }
with open(os.environ['GITHUB_OUTPUT'], 'a') as fh: with open(os.environ["GITHUB_OUTPUT"], "a") as fh:
fh.write(f"debian={','.join(tags[release_channel]['debian'])}\n") fh.write("debian<<EOF\n")
fh.write(f"alpine={','.join(tags[release_channel]['alpine'])}\n") fh.write("\n".join(tags[release_channel]["debian"]))
fh.write("\nEOF\n")
fh.write("alpine<<EOF\n")
fh.write("\n".join(tags[release_channel]["alpine"]))
fh.write("\nEOF\n")
id: tags id: tags
- name: Docker login - name: Docker login
@ -144,14 +149,16 @@ jobs:
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: meshtastic/meshtasticd images: meshtastic/meshtasticd
tags: ${{ steps.tags.outputs.debian }} tags: |
${{ steps.tags.outputs.debian }}
flavor: latest=false flavor: latest=false
- name: Create Docker manifest (Debian) - name: Create Docker manifest (Debian)
id: manifest_debian id: manifest_debian
uses: int128/docker-manifest-create-action@v2 uses: int128/docker-manifest-create-action@v2
with: with:
tags: ${{ steps.meta_debian.outputs.tags }} tags: |
${{ steps.meta_debian.outputs.tags }}
push: true push: true
sources: | sources: |
meshtastic/meshtasticd@${{ needs.docker-debian-amd64.outputs.digest }} meshtastic/meshtasticd@${{ needs.docker-debian-amd64.outputs.digest }}
@ -163,13 +170,15 @@ jobs:
uses: docker/metadata-action@v5 uses: docker/metadata-action@v5
with: with:
images: meshtastic/meshtasticd images: meshtastic/meshtasticd
tags: ${{ steps.tags.outputs.alpine }} tags: |
${{ steps.tags.outputs.alpine }}
- name: Create Docker manifest (Alpine) - name: Create Docker manifest (Alpine)
id: manifest_alpine id: manifest_alpine
uses: int128/docker-manifest-create-action@v2 uses: int128/docker-manifest-create-action@v2
with: with:
tags: ${{ steps.meta_alpine.outputs.tags }} tags: |
${{ steps.meta_alpine.outputs.tags }}
push: true push: true
sources: | sources: |
meshtastic/meshtasticd@${{ needs.docker-alpine-amd64.outputs.digest }} meshtastic/meshtasticd@${{ needs.docker-alpine-amd64.outputs.digest }}