From 9d3de7f6b5ab0da8c2f57629a2fbf4f604c67935 Mon Sep 17 00:00:00 2001
From: Bogdan Peter <bogdan.peter@paddypowerbetfair.com>
Date: Sat, 6 Jul 2024 22:13:30 +0300
Subject: [PATCH] try again

---
 .github/actions/build/docker/action.yml         | 9 +--------
 .github/workflows/build_and_test_main_merge.yml | 9 ++-------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/actions/build/docker/action.yml b/.github/actions/build/docker/action.yml
index 73b32f4a..4bd55e2e 100644
--- a/.github/actions/build/docker/action.yml
+++ b/.github/actions/build/docker/action.yml
@@ -54,13 +54,6 @@ runs:
         osctrl-${{ inputs.osctrl_component }}-${{ inputs.commit_sha }}-${{ inputs.go_os }}-${{ inputs.go_arch }}.bin \
         osctrl-${{ inputs.osctrl_component }}-${{ inputs.go_os }}-${{ inputs.go_arch }}.bin
 
-    ########################### Add meta data ###########################
-    - name: Docker meta
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}
-
     ########################### Log into Dockerhub ###########################
     - name: Login to Docker Hub
       uses: docker/login-action@v3.0.0
@@ -84,7 +77,7 @@ runs:
         context: .
         file: ./deploy/cicd/docker/Dockerfile-osctrl-${{ inputs.osctrl_component }}
         push: true
-        # tags: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:${{ inputs.docker_tag }}
+        tags: ${{ inputs.docker_hub_org }}/osctrl-${{ inputs.osctrl_component }}:${{ inputs.docker_tag }}
         platforms: "${{ inputs.go_os }}/${{ inputs.go_arch  }}"
         outputs: type=image,name=osctrl-${{ inputs.osctrl_component }},push-by-digest=true,name-canonical=true,push=true
         build-args: |
diff --git a/.github/workflows/build_and_test_main_merge.yml b/.github/workflows/build_and_test_main_merge.yml
index 155007de..dfdd9625 100644
--- a/.github/workflows/build_and_test_main_merge.yml
+++ b/.github/workflows/build_and_test_main_merge.yml
@@ -169,14 +169,9 @@ jobs:
         - name: Set up Docker Buildx
           uses: docker/setup-buildx-action@v3.0.0
 
-        - name: Docker meta
-          id: meta
-          uses: docker/metadata-action@v4
-          with:
-            images: ${{ matrix.image }}
-
+        ########################### Log into Dockerhub ###########################
         - name: Login to Docker Hub
-          uses: docker/login-action@v2
+          uses: docker/login-action@v3.0.0
           with:
             username: ${{ secrets.DOCKER_HUB_USERNAME }}
             password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}