From d72d4ce6b47ef14ae3f91c38782c28ac3227e46b Mon Sep 17 00:00:00 2001
From: Dominik Rosiek <drosiek@sumologic.com>
Date: Wed, 28 Feb 2024 09:32:01 +0100
Subject: [PATCH] chore: investigate ecr login issue

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
---
 .github/workflows/dev_builds.yml | 10 +++++++---
 Makefile                         |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
index 72401b6f8d..09bce154bf 100644
--- a/.github/workflows/dev_builds.yml
+++ b/.github/workflows/dev_builds.yml
@@ -195,8 +195,8 @@ jobs:
   build-windows-container-images:
     name: Build Windows container
     runs-on: windows-2022
-    needs:
-      - build
+    # needs:
+    #   - build
     strategy:
       matrix:
         arch_os: [ 'windows_amd64']
@@ -211,7 +211,11 @@ jobs:
         run: echo "Running dev build for ${{ steps.extract_tag.outputs.tag }}"
 
       - name: Login to Open Source ECR
-        run: make login
+        run: |
+          USERNAME=$(powershell.exe "echo \$Env:UserName")
+          cat "C:\\Users\\${USERNAME}\\.docker\\config.json" | grep -v "wincred" | sed 's/},$/}/' > "C:\\Users\\${USERNAME}\\.docker\\config.json.tmp"
+          mv "C:\\Users\\${USERNAME}\\.docker\\config.json.tmp" "C:\\Users\\${USERNAME}\\.docker\\config.json"
+          make login
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }}
diff --git a/Makefile b/Makefile
index dff89f38b8..d5e8dc0313 100644
--- a/Makefile
+++ b/Makefile
@@ -281,8 +281,8 @@ build-push-container-multiplatform-dev: REPO_URL = "$(OPENSOURCE_REPO_URL_DEV)"
 build-push-container-multiplatform-dev: build-push-container-multiplatform
 
 .PHONY: build-push-container-windows-dev
-build-push-container-multiplatform-dev: DOCKERFILE = Dockerfile_windows
-build-push-container-multiplatform-dev: build-push-container-multiplatform-dev
+build-push-container-windows-dev: DOCKERFILE = Dockerfile_windows
+build-push-container-windows-dev: build-push-container-multiplatform-dev
 
 .PHONY: push-container-manifest-dev
 push-container-manifest-dev: REPO_URL = "$(OPENSOURCE_REPO_URL_DEV)"
@@ -308,8 +308,8 @@ _build-container-multiplatform:
 build-container-multiplatform: _build-container-multiplatform
 
 .PHONY: build-container-windows
-build-push-container-windows: DOCKERFILE = Dockerfile_windows
-build-container-multiplatform: _build-container-multiplatform
+build-container-windows: DOCKERFILE = Dockerfile_windows
+build-container-windows: _build-container-multiplatform
 
 .PHONY: build-push-container-windows
 build-push-container-windows: PUSH = --push