From 351d7661ad6a1be44791a5ae5d52ae72c9d08637 Mon Sep 17 00:00:00 2001
From: penumbra23 <glbranimir@gmail.com>
Date: Wed, 3 Jul 2024 13:50:10 +0200
Subject: [PATCH] Enable push and remove commented definitions

---
 .github/actions/buildah-action/action.yaml   |  2 +-
 .github/workflows/merge-docker-timenode.yaml | 38 +++-----------------
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/.github/actions/buildah-action/action.yaml b/.github/actions/buildah-action/action.yaml
index ce98df287..ddacf77d7 100644
--- a/.github/actions/buildah-action/action.yaml
+++ b/.github/actions/buildah-action/action.yaml
@@ -86,5 +86,5 @@ runs:
       shell: bash
       if: ${{ inputs.push == 'true' }} 
       run: |
-        buildah push ${{ inputs.image_name }}:${{ github.sha }} ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
+        buildah push ${{ inputs.image_name }} ${{ inputs.registry }}/${{ inputs.image_name }}
 
diff --git a/.github/workflows/merge-docker-timenode.yaml b/.github/workflows/merge-docker-timenode.yaml
index f0436ea1b..d8333fa6c 100644
--- a/.github/workflows/merge-docker-timenode.yaml
+++ b/.github/workflows/merge-docker-timenode.yaml
@@ -46,15 +46,6 @@ jobs:
     steps:
       - name: Fetch latest code
         uses: actions/checkout@v3
-      # - name: Set up QEMU
-      #   uses: docker/setup-qemu-action@v2
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v2
-      # - name: Login to Docker Hub
-      #   uses: docker/login-action@v2
-      #   with:
-      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Create target dir
         run: mkdir ${{ github.workspace }}/target
       - name: Cache Rust deps
@@ -68,32 +59,13 @@ jobs:
           image_name: ${{ env.DOCKER_REPO }}-${{ matrix.image }}:${{ needs.set-tags.outputs.commit_hash8 }}
           containerfile: ./config/docker/Dockerfile.release
           context: .
-          volume: ${{ github.workspace }}/target:/build/target  # Optional volume bind mount
-          username: ${{ secrets.DOCKERHUB_USERNAME }}  # Optional registry username
-          password: ${{ secrets.DOCKERHUB_TOKEN }}  # Optional registry password
-          registry: docker.io  # Optional registry URL
-          push: 'false'  # Optional push flag
+          volume: ${{ github.workspace }}/target:/build/target
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: docker.io
+          push: 'true'
           build_args: |
             PROFILE=${{ matrix.profile }}
             VCS_REF=${{ needs.set-tags.outputs.commit_hash8 }}
             BUILD_VARIANT=${{ matrix.image }}
             FEATURES=${{ matrix.features }}
-      # - name: Build
-      #   run: | 
-      #     buildah bud -v $PWD/target:/build/target                        \
-      #       -t timechain-node:${{ needs.set-tags.outputs.commit_hash8 }}  \
-      #       -f config/docker/Dockerfile.release                           \
-      #       --build-arg PROFILE=production --build-arg VCS_REF=commit --build-arg BUILD_VARIANT=prod \
-      #       --dns '8.8.8.8' .
-      # - name: Build and push
-      #   uses: docker/build-push-action@v4
-      #   with:
-      #     context: .
-      #     push: true
-      #     tags: ${{ env.DOCKER_REPO }}-${{ matrix.image }}:${{ needs.set-tags.outputs.commit_hash8 }}
-      #     file: config/docker/Dockerfile.release
-      #     build-args: |
-      #       VCS_REF=${{ needs.set-tags.outputs.commit_hash8 }}
-      #       PROFILE=${{ matrix.profile }}
-      #       FEATURES=${{ matrix.features }}
-      #       BUILD_VARIANT=${{ matrix.image }}