wip

Author: phearnot

.github/workflows/fix-docker-publish.yml

@@ -11,7 +11,7 @@ jobs:
       raw-docker-tags: |
         type=raw,value=1.5.12
         type=raw,value=latest,enable=true
-      environment: Docker Hub
+      environment: ''
       ref: v1.5.12
     permissions:
       contents: read

.github/workflows/publish-docker-image.yml

@@ -49,17 +49,15 @@ jobs:
       - uses: regclient/actions/regctl-installer@4d6888fcc4842c9630f60ebc91715a45dd9bd7a3
       - uses: proudust/gh-describe@70f72d4f6304ea053cf5a3d71c36211d5acc0c73
         id: ghd
+        with:
+          commit-ish: ${{ inputs.ref || github.sha}}
       - name: Prepare base image and node version
         run: |
           BASE_IMAGE=${{ inputs.base-image }}
           BASE_IMAGE=${BASE_IMAGE:-$(head -n1 docker/Dockerfile | cut -d= -f2-)}
           echo "base-image=$BASE_IMAGE" >> "$GITHUB_OUTPUT"
           echo "base-image-digest=$(regctl manifest digest $BASE_IMAGE)" >> "$GITHUB_OUTPUT"
-          if [ -n "${{ inputs.ref }}" ]; then
-            echo "node-version=$(echo ${{ inputs.ref }} | cut -c 2-)" >> $GITHUB_OUTPUT
-          else
-            echo "node-version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-)" >> "$GITHUB_OUTPUT"
-          fi
+          echo "node-version=$(echo ${{ steps.ghd.outputs.describe }} | cut -c 2-)" >> "$GITHUB_OUTPUT"
         id: versions
       - uses: actions/setup-java@v4
         with:
@@ -95,12 +93,13 @@ jobs:
         run: |
           {
             echo 'annotations<<EOF'
-            echo org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ github.sha }}/docker
+            echo org.opencontainers.image.source=https://github.com/${{ github.repository }}/tree/${{ steps.ghd.outputs.sha }}/docker
             echo org.opencontainers.image.licenses=MIT
             echo org.opencontainers.image.description=Waves Node
             echo org.opencontainers.image.base.name=${{ steps.versions.outputs.base-image }}
             echo org.opencontainers.image.base.digest=${{ steps.versions.outputs.base-image-digest }}
             echo org.opencontainers.image.version=${{ steps.versions.outputs.node-version }}
+            echo org.opencontainers.image.revision=${{ steps.ghd.outputs.sha }}
             echo EOF
           } >> "$GITHUB_OUTPUT"
         id: annotations
@@ -126,6 +125,7 @@ jobs:
           labels: ${{ steps.tag-list.outputs.annotations }}
           annotations: ${{ steps.annotations.outputs.annotations }}
       - uses: docker/build-push-action@v6
+        if: false
         id: push
         with:
           context: ./docker