From b369fcc7fef2197a7f64b46c0ada1100a3f1d7e2 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Thu, 4 Jan 2024 15:57:57 -0500
Subject: [PATCH 01/15] needed org on image build, fixes platform pair

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml  | 7 ++++---
 .github/workflows/release.yml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 63428ed8a9e..6e1d309e6fa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -41,9 +41,10 @@ jobs:
           - linux/arm64
     steps:
       - name: Prepare
+        id: prep
         run: |
             platform=${{ matrix.platform }}
-            echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+            echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_OUTPUT
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Set up Java
@@ -56,11 +57,11 @@ jobs:
       - name: distDocker
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: distDocker
+          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
       - name: test image
         run: |
           mkdir -p docker/reports
-          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-$PLATFORM-PAIR -o ./docker/tests/goss-$PLATFORM-PAIR
+          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
       - name: test docker
         uses: gradle/gradle-build-action@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c3d3c37e2ac..811fc380253 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: release besu
 on:
   workflow_dispatch:
   release:
-    types: released
+    types: [released]
 jobs:
   dockerPromoteX64:
     runs-on: ubuntu-22.04

From 6139ecac5cacbe596f3edd629cfcebac6e40d967 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Thu, 4 Jan 2024 16:15:46 -0500
Subject: [PATCH 02/15] docker test needed an org too

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6e1d309e6fa..7d660edb057 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -65,7 +65,7 @@ jobs:
       - name: test docker
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: testDocker
+          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:

From 3c0d1ebb7da42bb2cae0430a40749132e40b6d3f Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Thu, 4 Jan 2024 20:29:09 -0500
Subject: [PATCH 03/15] testDocker needs an env var

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 7d660edb057..78e93207b5c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,8 +36,6 @@ jobs:
       matrix:
         platform:
           - linux/amd64
-          - linux/arm/v6
-          - linux/arm/v7
           - linux/arm64
     steps:
       - name: Prepare
@@ -45,6 +43,7 @@ jobs:
         run: |
             platform=${{ matrix.platform }}
             echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_OUTPUT
+            echo "ARCH=${platform//linux\//}" >> $GITHUB_OUTPUT
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Set up Java
@@ -54,16 +53,18 @@ jobs:
           java-version: 17
       - name: setup gradle
         uses: gradle/gradle-build-action@v2
-      - name: distDocker
+      - name: build image
         uses: gradle/gradle-build-action@v2
         with:
           arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
-      - name: test image
+      - name: install goss
         run: |
           mkdir -p docker/reports
-          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
+          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
       - name: test docker
         uses: gradle/gradle-build-action@v2
+        env:
+          architecture: ${{ steps.prep.outputs.ARCH }}
         with:
           arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
       - name: Login to DockerHub

From fed55d4798d8dad2eca13152b6588b5da17a13e2 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 10:05:51 -0500
Subject: [PATCH 04/15] need to run on self hosted arm

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 78e93207b5c..97001c6c462 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,21 +29,26 @@ jobs:
       - name: hadoLint_graalvm
         run: docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile
   buildDocker:
-    runs-on: ubuntu-22.04
+    runs-on: ${ matrix.platform }
     needs: hadolint
     strategy:
       fail-fast: false
       matrix:
         platform:
-          - linux/amd64
-          - linux/arm64
+          - ubuntu-22.04
+          - [self-hosted, ARM64, macOS]
     steps:
       - name: Prepare
         id: prep
         run: |
             platform=${{ matrix.platform }}
-            echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_OUTPUT
-            echo "ARCH=${platform//linux\//}" >> $GITHUB_OUTPUT
+            if [ "$platform" = 'ubuntu-22.04' ]; then 
+              echo "PLATFORM_PAIR=linux-amd64" >> $GITHUB_OUTPUT
+              echo "ARCH=amd64" >> $GITHUB_OUTPUT
+            else
+              echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_OUTPUT
+              echo "ARCH=arm64" >> $GITHUB_OUTPUT
+            fi
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Set up Java

From 3d300332cf258ae2948da01aa8dc9fd78526fe6f Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 10:13:22 -0500
Subject: [PATCH 05/15] order matters

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 97001c6c462..0a56b06ca20 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,7 +29,6 @@ jobs:
       - name: hadoLint_graalvm
         run: docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile
   buildDocker:
-    runs-on: ${ matrix.platform }
     needs: hadolint
     strategy:
       fail-fast: false
@@ -37,6 +36,7 @@ jobs:
         platform:
           - ubuntu-22.04
           - [self-hosted, ARM64, macOS]
+    runs-on: ${ matrix.platform }
     steps:
       - name: Prepare
         id: prep

From 1d3d43e5f18de6f60b780a58eb37f0c61565b773 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 10:16:02 -0500
Subject: [PATCH 06/15] syntax matters

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0a56b06ca20..6132df5b332 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,7 +36,7 @@ jobs:
         platform:
           - ubuntu-22.04
           - [self-hosted, ARM64, macOS]
-    runs-on: ${ matrix.platform }
+    runs-on: ${{ matrix.platform }}
     steps:
       - name: Prepare
         id: prep

From 229e2953f2f46768272ac946d50c5a51811b150e Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 10:43:23 -0500
Subject: [PATCH 07/15] don't rerun image build so often, and fix tag
 collisions

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 2 ++
 build.gradle                 | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6132df5b332..cc13117c621 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -74,6 +74,8 @@ jobs:
           arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
       - name: Login to DockerHub
         uses: docker/login-action@v2
+        env:
+          architecture: ${{ steps.prep.outputs.ARCH }}
         with:
           username: ${{ secrets.DOCKER_USER_RW }}
           password: ${{ secrets.DOCKER_PASSWORD_RW }}
diff --git a/build.gradle b/build.gradle
index 6dd81d3b731..d2408bef310 100644
--- a/build.gradle
+++ b/build.gradle
@@ -750,7 +750,6 @@ task distDocker {
 }
 
 task testDocker {
-  dependsOn distDocker
   def dockerReportsDir = "docker/reports/"
 
   doFirst {
@@ -770,7 +769,6 @@ task testDocker {
 }
 
 task dockerUpload {
-  dependsOn distDocker
   def architecture = System.getenv('architecture')
   def image = "${dockerImageName}:${dockerBuildVersion}"
   def additionalTags = []

From 5731859a9a0649130b2f4acae0bf46f8145cd46a Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 10:53:16 -0500
Subject: [PATCH 08/15] whoops wrong step

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cc13117c621..0504ff9e9ad 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -74,10 +74,10 @@ jobs:
           arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
       - name: Login to DockerHub
         uses: docker/login-action@v2
-        env:
-          architecture: ${{ steps.prep.outputs.ARCH }}
         with:
           username: ${{ secrets.DOCKER_USER_RW }}
           password: ${{ secrets.DOCKER_PASSWORD_RW }}
       - name: publish
+        env:
+          architecture: ${{ steps.prep.outputs.ARCH }}
         run: ./gradlew --no-daemon -PdockerOrgName=${{ secrets.DOCKER_ORG }} dockerUpload

From 04728b166eb87417fcfaa7dbb0979e19b4232dea Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 13:43:47 -0500
Subject: [PATCH 09/15] include git sha in docker naming

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0504ff9e9ad..af5f2cefc6c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -49,6 +49,9 @@ jobs:
               echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_OUTPUT
               echo "ARCH=arm64" >> $GITHUB_OUTPUT
             fi
+      - name: short sha
+        id: shortSha
+        run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - name: Checkout Repo
         uses: actions/checkout@v3
       - name: Set up Java
@@ -61,7 +64,7 @@ jobs:
       - name: build image
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
+          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
       - name: install goss
         run: |
           mkdir -p docker/reports
@@ -71,7 +74,7 @@ jobs:
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
         with:
-          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }}
+          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
@@ -80,4 +83,4 @@ jobs:
       - name: publish
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
-        run: ./gradlew --no-daemon -PdockerOrgName=${{ secrets.DOCKER_ORG }} dockerUpload
+        run: ./gradlew --no-daemon -PdockerOrgName=${{ secrets.DOCKER_ORG }} dockerUpload -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT

From cd1b5baf6259ae21b8ff813ed4091c1bb1fa1718 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 14:01:18 -0500
Subject: [PATCH 10/15] no more manual sha256ing

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/artifacts.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index c0049133741..ba203039b51 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -22,17 +22,30 @@ jobs:
         uses: gradle/gradle-build-action@v2
       - name: assemble distributions
         run: ./gradlew assemble -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
-      - name: short sha
-        id: shortSha
-        run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: hashes
+        id: hashes
+        run: |
+          echo "gitSha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "zipSha=$(md5sum -a 256 build/distributions/besu*.zip)" >> $GITHUB_OUTPUT
+          echo "tarSha=$(md5sum -a 256 build/distributions/besu*.tar.gz)" >> $GITHUB_OUTPUT
       - name: upload tarball
         uses: actions/upload-artifact@v3
         with:
-          name: besu-${{ steps.shortSha.outputs.sha }}.tar.gz
+          name: besu-${{ steps.hashes.outputs.gitSha }}.tar.gz
           path: 'build/distributions/besu*.tar.gz'
       - name: upload zipfile
         uses: actions/upload-artifact@v3
         with:
-          name: besu-${{ steps.shortSha.outputs.sha }}.zip
+          name: besu-${{ steps.hashes.outputs.gitSha }}.zip
           path: 'build/distributions/besu*.zip'
+      - name: Upload Release assets
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            build/distributions/besu*.tar.gz
+            build/distributions/besu*.zip
+          body: |
+            tarball: ${{steps.hashes.outputs.tarSha}}
+            zipfile: ${{steps.hashes.outputs.zipSha}}
+
 

From b29cfe841d6b54af79113091dfc00379f68c5303 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 14:07:33 -0500
Subject: [PATCH 11/15] new job for multi-arch manifest

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/docker.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index af5f2cefc6c..eb1d3ff0c51 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -84,3 +84,9 @@ jobs:
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
         run: ./gradlew --no-daemon -PdockerOrgName=${{ secrets.DOCKER_ORG }} dockerUpload -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
+  multiArch:
+    needs: buildDocker
+    runs-on: ubuntu-22.04
+    steps:
+      - name: multi-arch docker
+        run: ./gradlew -PdockerOrgName=${{secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT manifestDocker

From b1611ce36446eb6714c65139e87b4a7b47856f1d Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 14:16:01 -0500
Subject: [PATCH 12/15] md5? really boomer?

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/artifacts.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index ba203039b51..a900356713d 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -26,8 +26,8 @@ jobs:
         id: hashes
         run: |
           echo "gitSha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "zipSha=$(md5sum -a 256 build/distributions/besu*.zip)" >> $GITHUB_OUTPUT
-          echo "tarSha=$(md5sum -a 256 build/distributions/besu*.tar.gz)" >> $GITHUB_OUTPUT
+          echo "zipSha=$(shasum -a 256 build/distributions/besu*.zip)" >> $GITHUB_OUTPUT
+          echo "tarSha=$(shasum -a 256 build/distributions/besu*.tar.gz)" >> $GITHUB_OUTPUT
       - name: upload tarball
         uses: actions/upload-artifact@v3
         with:

From b8019306705410f4fdfc1bd1d65f980803b63255 Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 14:52:18 -0500
Subject: [PATCH 13/15] whoops can't get sha till checkout

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/artifacts.yml | 2 +-
 .github/workflows/docker.yml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index a900356713d..5065a8344fa 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   release:
     types:
-      - created
+      - prereleased
 
 jobs:
   artifacts:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index eb1d3ff0c51..4905a8d71d5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   release:
     types:
-      - created
+      - prereleased
 
 jobs:
   hadolint:
@@ -49,11 +49,11 @@ jobs:
               echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_OUTPUT
               echo "ARCH=arm64" >> $GITHUB_OUTPUT
             fi
+      - name: Checkout Repo
+        uses: actions/checkout@v3
       - name: short sha
         id: shortSha
         run: echo "sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-      - name: Checkout Repo
-        uses: actions/checkout@v3
       - name: Set up Java
         uses: actions/setup-java@v3
         with:

From cf32fae22c0d632b442e2694970e4771e8cbb8be Mon Sep 17 00:00:00 2001
From: jflo <justin+github@florentine.us>
Date: Fri, 5 Jan 2024 16:10:35 -0500
Subject: [PATCH 14/15] only need artifacts and docker images on release prep

Signed-off-by: jflo <justin+github@florentine.us>
---
 .github/workflows/artifacts.yml | 7 ++-----
 .github/workflows/docker.yml    | 9 ++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 5065a8344fa..02ae116845a 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -2,7 +2,6 @@
 name: artifacts
 
 on:
-  workflow_dispatch:
   release:
     types:
       - prereleased
@@ -21,22 +20,20 @@ jobs:
       - name: setup gradle
         uses: gradle/gradle-build-action@v2
       - name: assemble distributions
-        run: ./gradlew assemble -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+        run:
+          ./gradlew -Prelease.releaseVersion=${{github.ref_name}} assemble -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: hashes
         id: hashes
         run: |
-          echo "gitSha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "zipSha=$(shasum -a 256 build/distributions/besu*.zip)" >> $GITHUB_OUTPUT
           echo "tarSha=$(shasum -a 256 build/distributions/besu*.tar.gz)" >> $GITHUB_OUTPUT
       - name: upload tarball
         uses: actions/upload-artifact@v3
         with:
-          name: besu-${{ steps.hashes.outputs.gitSha }}.tar.gz
           path: 'build/distributions/besu*.tar.gz'
       - name: upload zipfile
         uses: actions/upload-artifact@v3
         with:
-          name: besu-${{ steps.hashes.outputs.gitSha }}.zip
           path: 'build/distributions/besu*.zip'
       - name: Upload Release assets
         uses: softprops/action-gh-release@v1
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4905a8d71d5..2947a9ada91 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,6 +1,5 @@
 name: docker
 on:
-  workflow_dispatch:
   release:
     types:
       - prereleased
@@ -64,7 +63,7 @@ jobs:
       - name: build image
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
+          arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ github.ref_name }}
       - name: install goss
         run: |
           mkdir -p docker/reports
@@ -74,7 +73,7 @@ jobs:
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
         with:
-          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
+          arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ github.ref_name }}
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
@@ -83,10 +82,10 @@ jobs:
       - name: publish
         env:
           architecture: ${{ steps.prep.outputs.ARCH }}
-        run: ./gradlew --no-daemon -PdockerOrgName=${{ secrets.DOCKER_ORG }} dockerUpload -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT
+        run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ github.ref_name }}
   multiArch:
     needs: buildDocker
     runs-on: ubuntu-22.04
     steps:
       - name: multi-arch docker
-        run: ./gradlew -PdockerOrgName=${{secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ steps.shortSha.outputs.sha }}-SNAPSHOT manifestDocker
+        run: ./gradlew manifestDocker -PdockerOrgName=${{secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ github.ref_name }}

From 55a38d1220dfae9ec4b94e85e4d9c578d0f083b2 Mon Sep 17 00:00:00 2001
From: Justin Florentine <justin+github@florentine.us>
Date: Mon, 8 Jan 2024 14:18:34 -0500
Subject: [PATCH 15/15] filename already included

Signed-off-by: Justin Florentine <justin+github@florentine.us>
---
 .github/workflows/artifacts.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index 02ae116845a..19594e1f14e 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -38,11 +38,12 @@ jobs:
       - name: Upload Release assets
         uses: softprops/action-gh-release@v1
         with:
+          append_body: true
           files: |
             build/distributions/besu*.tar.gz
             build/distributions/besu*.zip
           body: |
-            tarball: ${{steps.hashes.outputs.tarSha}}
-            zipfile: ${{steps.hashes.outputs.zipSha}}
+            ${{steps.hashes.outputs.tarSha}}
+            ${{steps.hashes.outputs.zipSha}}