Fix package version

.github/workflows/publish.yml

@@ -27,6 +27,7 @@ jobs:
       outputs:
         version: ${{ steps.export-version.outputs.version}}
         pkg_version: ${{ steps.export-version.outputs.pkg_version }}
+        image_version: ${{ steps.export-version.outputs.image_version }}
       steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -48,22 +49,30 @@ jobs:
           go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.16.0
       - name: get-version
         run: |
+          COMMIT="$(git rev-parse --short HEAD)"
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
               VERSION="${{ github.event.inputs.version }}"
+              IMAGE_VERSION=$VERSION
           elif [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
               VERSION=$GITHUB_REF_NAME
+              IMAGE_VERSION=$VERSION
           else
               VERSION=""
+              IMAGE_VERSION="latest"
           fi
-          COMMIT="$(git rev-parse --short HEAD)"
           PKG_VERSION=${VERSION:-dev-$COMMIT}
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "PKG_VERSION=$PKG_VERSION" >> $GITHUB_ENV
+          echo "IMAGE_VERSION=$IMAGE_VERSION" >> $GITHUB_ENV
       - name: build and package disruptor
         env:
+          VERSION: ${{ env.VERSION }}
           PKG_VERSION: ${{ env.PKG_VERSION }}
         run: |
-          ./build-package.sh -v $PKG_VERSION all
+          if [[ ! -z $VERSION ]]; then 
+            VERSION="-v $VERSION"
+          fi
+          ./release.sh $VERSION -r $PKG_VERSION
       - name: Build and package agent
         env:
           PKG_VERSION: ${{ env.PKG_VERSION }}
@@ -84,10 +93,11 @@ jobs:
         env:
           VERSION: ${{ env.VERSION }}
           PKG_VERSION: ${{ env.PKG_VERSION }}
+          IMAGE_VERSION: ${{ env.IMAGE_VERSION }}
         run: |
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "pkg_version=$PKG_VERSION" >> $GITHUB_OUTPUT
-          cat $GITHUB_OUTPUT
+          echo "image_version=$IMAGE_VERSION" >> $GITHUB_OUTPUT
 
   build-windows-installer:
     runs-on: windows-2019
@@ -145,6 +155,7 @@ jobs:
         run: |
           echo "VERSION=${{needs.build-binaries.outputs.version}}" >> $GITHUB_ENV
           echo "PKG_VERSION=${{needs.build-binaries.outputs.pkg_version}}" >> $GITHUB_ENV
+          echo "IMAGE_VERSION=${{needs.build-binaries.outputs.image_version}}" >> $GITHUB_ENV
       - name: Download binaries
         uses: actions/download-artifact@v3
         with:
@@ -164,19 +175,19 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push disruptor image
         env:
-          VERSION: ${{ env.VERSION }}
+          IMAGE_VERSION: ${{ env.IMAGE_VERSION }}
           PKG_VERSION: ${{ env.PKG_VERSION }}
         run: |
-          IMAGE_TAG="$REGISTRY/$DISRUPTOR_IMAGE_NAME:${VERSION:-latest}"
+          IMAGE_TAG="$REGISTRY/$DISRUPTOR_IMAGE_NAME:${IMAGE_VERSION:-latest}"
           mkdir images/disruptor/build/
           cat dist/xk6-disruptor-${PKG_VERSION}-linux-*.tar.gz | tar -xzf - -i -C images/disruptor/build/
           docker buildx build -t $IMAGE_TAG --platform=linux/amd64,linux/arm64 images/disruptor --push
       - name: Build and push agent image
         env:
-          VERSION: ${{ env.VERSION }}
+          IMAGE_VERSION: ${{ env.IMAGE_VERSION }}
           PKG_VERSION: ${{ env.PKG_VERSION }}
         run: |
-          IMAGE_TAG="$REGISTRY/$AGENT_IMAGE_NAME:${VERSION:-latest}"
+          IMAGE_TAG="$REGISTRY/$AGENT_IMAGE_NAME:${IMAGE_VERSION:-latest}"
           mkdir images/agent/build/
           cat dist/xk6-disruptor-agent-${PKG_VERSION}-linux-*.tar.gz | tar -xzf - -i -C images/agent/build/
           docker buildx build -t $IMAGE_TAG --platform=linux/amd64,linux/arm64 images/agent --push