From 763b75a48d86430393f8f75a3fe99e922c8720d9 Mon Sep 17 00:00:00 2001 From: antondlr Date: Tue, 6 May 2025 22:09:58 +0200 Subject: [PATCH 1/4] use correct env vars --- .github/workflows/release.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20b129a7..7cce36d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,8 +7,8 @@ on: env: REPO_NAME: ${{ github.repository_owner }}/siren - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DH_KEY }} + DOCKER_USERNAME: ${{ secrets.DH_ORG }} IMAGE_NAME: ${{ secrets.DOCKER_USERNAME }}/siren jobs: @@ -66,15 +66,15 @@ jobs: - [ ] Prepare Discord post. Someone with appropriate access rights should run these commands: - 0. sanity check: did the `docker` workflow complete correctly, are the images published under the `sigmaprime` namespace? + 0. sanity check: did the `docker` workflow complete correctly, are the images published under the `${{ env.DOCKER_USERNAME }}` namespace? see: https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=${{ env.VERSION }} and https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=latest 1. publish `latest`: - `docker manifest create sigp/siren:latest --amend sigmaprime/siren:latest-amd64 --amend sigmaprime/siren:latest-arm64` - `docker manifest push sigp/siren:latest` + `docker manifest create ${{ env.DOCKER_USERNAME }}/siren:latest --amend ${{ env.DOCKER_USERNAME }}/siren:latest-amd64 --amend ${{ env.DOCKER_USERNAME }}/siren:latest-arm64` + `docker manifest push ${{ env.DOCKER_USERNAME }}/siren:latest` 2. publish `${{ env.VERSION }}`: - `docker manifest create sigp/siren:${{ env.VERSION }} --amend sigmaprime/siren:${{ env.VERSION }}-amd64 --amend sigmaprime/siren:${{ env.VERSION }}-arm64` - `docker manifest push sigp/siren:${{ env.VERSION }}` - 3. verify: https://hub.docker.com/r/siren/siren/tags?name=${{ env.VERSION }} and https://hub.docker.com/r/sigp/siren/tags?name=latest + `docker manifest create ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }} --amend ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}-amd64 --amend ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}-arm64` + `docker manifest push ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}` + 3. verify: https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=${{ env.VERSION }} and https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=latest ## Summary From 482aea19b9ad9e1e02e7359b00f7b983dff6cbb7 Mon Sep 17 00:00:00 2001 From: antondlr Date: Tue, 6 May 2025 22:10:55 +0200 Subject: [PATCH 2/4] multiarch manifest is pushed by `docker` workflow --- .github/workflows/release.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cce36d9..7e48b05f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,17 +65,6 @@ jobs: - [ ] Ensure docker images are published to `sigp` namespace (instructions below) - [ ] Prepare Discord post. - Someone with appropriate access rights should run these commands: - 0. sanity check: did the `docker` workflow complete correctly, are the images published under the `${{ env.DOCKER_USERNAME }}` namespace? - see: https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=${{ env.VERSION }} and https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=latest - 1. publish `latest`: - `docker manifest create ${{ env.DOCKER_USERNAME }}/siren:latest --amend ${{ env.DOCKER_USERNAME }}/siren:latest-amd64 --amend ${{ env.DOCKER_USERNAME }}/siren:latest-arm64` - `docker manifest push ${{ env.DOCKER_USERNAME }}/siren:latest` - 2. publish `${{ env.VERSION }}`: - `docker manifest create ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }} --amend ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}-amd64 --amend ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}-arm64` - `docker manifest push ${{ env.DOCKER_USERNAME }}/siren:${{ env.VERSION }}` - 3. verify: https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=${{ env.VERSION }} and https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=latest - ## Summary Add a summary. From 5a994cb3389bbb8b8cc7374f5cc47e4dd3dc1707 Mon Sep 17 00:00:00 2001 From: antondlr Date: Tue, 6 May 2025 22:12:47 +0200 Subject: [PATCH 3/4] use variable link --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e48b05f..48d36775 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: ## Release Checklist (DELETE ME) - [ ] Merge `unstable` -> `stable`. - - [ ] Ensure docker images are published to `sigp` namespace (instructions below) + - [ ] Ensure docker images are published to `sigp` namespace (happens with succesful docker workflow) - [ ] Prepare Discord post. ## Summary @@ -83,7 +83,7 @@ jobs: ${{ steps.changelog.outputs.CHANGELOG }} ## Docker Hub - https://hub.docker.com/r/sigp/siren/tags?name=${{ env.VERSION }} + https://hub.docker.com/r/${{ env.DOCKER_USERNAME }}/siren/tags?name=${{ env.VERSION }} ENDBODY ) From fcb0a1f084f06187cdcdc286ab22bd6a36728b00 Mon Sep 17 00:00:00 2001 From: antondlr Date: Wed, 7 May 2025 09:49:31 +0200 Subject: [PATCH 4/4] remove unused and faulty `IMAGE_NAME` var --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48d36775..f4258e9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,6 @@ env: REPO_NAME: ${{ github.repository_owner }}/siren DOCKER_PASSWORD: ${{ secrets.DH_KEY }} DOCKER_USERNAME: ${{ secrets.DH_ORG }} - IMAGE_NAME: ${{ secrets.DOCKER_USERNAME }}/siren jobs: extract-version: