again

ClickHouse · Jan 23, 2025 · b22942d · b22942d
1 parent 8cdb981
commit b22942d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.github/workflows/kubenetmon.yaml b/.github/workflows/kubenetmon.yaml
@@ -78,7 +78,7 @@ jobs:
           load: true
 
       - name: Save image as artifact
-        run: docker save ${{ steps.meta.outputs.tags }} -o image.tar
+        run: docker save -o image.tar ${{ steps.meta.outputs.tags }}
 
       - name: Upload image artifact
         uses: actions/upload-artifact@v4
@@ -185,12 +185,18 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate Version
+        id: version
+        run: |
+          # Use short commit SHA as the version
+          VERSION=$(git rev-parse --short HEAD)
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+
       - name: Push to GitHub Container Registry
         run: |
-          IMAGE_TAG=$(echo ${{ needs.build-docker-image.outputs.image-tags }} | grep sha | cut -d':' -f2)
-          docker tag ${{ needs.build-docker-image.outputs.image-tags }} ghcr.io/clickhouse/kubenetmon:$IMAGE_TAG
+          docker tag ${{ needs.build-docker-image.outputs.image-tags }} ghcr.io/clickhouse/kubenetmon:$VERSION
           docker tag ${{ needs.build-docker-image.outputs.image-tags }} ghcr.io/clickhouse/kubenetmon:latest
-          docker push ghcr.io/clickhouse/kubenetmon:$IMAGE_TAG
+          docker push ghcr.io/clickhouse/kubenetmon:$VERSION
           docker push ghcr.io/clickhouse/kubenetmon:latest
 
   helm-publish: