From 513618669170f69aebbe82afe98fdff44cb3b93f Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Fri, 20 Sep 2024 11:00:20 +1200
Subject: [PATCH 1/8] updating attest params

---
 .github/workflows/ci.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2547b878..2408eab7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -84,10 +84,10 @@ jobs:
       - name: "[execution] build and push docker images"
         run: |
           if [ "${{ matrix.config.platform }}" == "windows" ]; then
-            docker buildx build --output=type=registry --attest type=sbom,generator=docker/scout-sbom-indexer:latest --attest type=provenance,mode=max --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} --build-arg OSVERSION=${{ matrix.config.version }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
+            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} --build-arg OSVERSION=${{ matrix.config.version }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
           else 
-            docker buildx build --output=type=registry --attest type=sbom,generator=docker/scout-sbom-indexer:latest --attest type=provenance,mode=max --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
-            docker buildx build --output=type=registry --attest type=sbom,generator=docker/scout-sbom-indexer:latest --attest type=provenance,mode=max --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" -f build/${{ matrix.config.platform }}/alpine.Dockerfile .
+            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
+            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" -f build/${{ matrix.config.platform }}/alpine.Dockerfile .
           fi
         env:
           CONTAINER_IMAGE_TAG: ${{ env.CONTAINER_IMAGE_TAG }}

From 56743e6166359807d8045aa9e485e910b00804df Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 15:33:12 +1200
Subject: [PATCH 2/8] testing manifest creation

---
 .github/workflows/ci.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2408eab7..9b1068be 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -123,7 +123,7 @@ jobs:
             CONTAINER_IMAGE_TAG=$(echo $GITHUB_REF_NAME | sed 's/\//-/g')
           fi
 
-          docker buildx imagetools create -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" \
+          docker manifest create "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-amd64" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-arm64" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-arm" \
@@ -131,7 +131,11 @@ jobs:
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-windows1809-amd64" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-windowsltsc2022-amd64"
 
-          docker buildx imagetools create -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" \
+          docker manifest push "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}"
+
+          docker manifest create "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-amd64-alpine" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-arm64-alpine" \
             "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-linux-arm-alpine"
+
+          docker manifest push "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine"

From 7f2f8676cc09848391af4bd14b6e1836c9954c9c Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 15:40:00 +1200
Subject: [PATCH 3/8] testing manifests

---
 .github/workflows/ci.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9b1068be..8f4d361b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -84,10 +84,10 @@ jobs:
       - name: "[execution] build and push docker images"
         run: |
           if [ "${{ matrix.config.platform }}" == "windows" ]; then
-            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} --build-arg OSVERSION=${{ matrix.config.version }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
+            docker buildx build --output=type=registry --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} --build-arg OSVERSION=${{ matrix.config.version }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
           else 
-            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
-            docker buildx build --output=type=registry --attest type=provenance,mode=max --attest type=sbom,disabled=false --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" -f build/${{ matrix.config.platform }}/alpine.Dockerfile .
+            docker buildx build --output=type=registry --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}" -f build/${{ matrix.config.platform }}/Dockerfile .
+            docker buildx build --output=type=registry --platform ${{ matrix.config.platform }}/${{ matrix.config.arch }} -t "${DOCKER_HUB_REPO}:${CONTAINER_IMAGE_TAG}-alpine" -f build/${{ matrix.config.platform }}/alpine.Dockerfile .
           fi
         env:
           CONTAINER_IMAGE_TAG: ${{ env.CONTAINER_IMAGE_TAG }}

From 66408730033d12721370e6ada7b5f6cddedbdca2 Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 15:47:45 +1200
Subject: [PATCH 4/8] testing manifests

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8f4d361b..a4d04ce1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -52,7 +52,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.0.0
         with:
           endpoint: builders
-          driver-opts: image=moby/buildkit:v0.13.2
+          driver-opts: image=moby/buildkit:v0.10.6
       - name: "[preparation] docker login"
         uses: docker/login-action@v3.0.0
         with:

From eb7b580146c4b6031c7e3fbdc054e1fadcf4528a Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 15:57:57 +1200
Subject: [PATCH 5/8] testing manifests

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a4d04ce1..cc8ddbbb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -52,7 +52,7 @@ jobs:
         uses: docker/setup-buildx-action@v3.0.0
         with:
           endpoint: builders
-          driver-opts: image=moby/buildkit:v0.10.6
+          # driver-opts: image=moby/buildkit:v0.10.6
       - name: "[preparation] docker login"
         uses: docker/login-action@v3.0.0
         with:

From c5702dbd8d717fd0cbd32ec3aa5e9740c4f207a5 Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 16:04:06 +1200
Subject: [PATCH 6/8] testing manifests

---
 build/windows/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 27bee828..28eb0f13 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -4,18 +4,18 @@ FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercor
 FROM mcr.microsoft.com/windows/nanoserver:${OSVERSION}
 ENV PATH="C:\mingit\cmd;C:\app;C:\Windows\system32;C:\Windows;"
 
-COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
+COPY --from=core /Windows/System32/netapi32.dll C:/Windows/System32/netapi32.dll
 
 USER ContainerAdministrator
 
-COPY dist/mingit/ mingit/
-COPY dist/agent.exe /app/
-COPY dist/docker.exe /app/
-COPY dist/docker-compose.exe /app/
-COPY dist/docker-credential-portainer.exe /app/
-COPY dist/kubectl.exe /app/
+COPY dist/mingit/ C:/mingit/
+COPY dist/agent.exe C:/app/
+COPY dist/docker.exe C:/app/
+COPY dist/docker-compose.exe C:/app/
+COPY dist/docker-credential-portainer.exe C:/app/
+COPY dist/kubectl.exe C:/app/
 
-COPY static /app/static
+COPY static C:/app/static
 COPY config /Users/ContainerAdministrator/.docker/
 
 LABEL io.portainer.agent=true

From 1ebbb6d06f18fe05a3e9e1f76119bdb364b24bca Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 16:10:00 +1200
Subject: [PATCH 7/8] testing manifests

---
 build/windows/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 28eb0f13..191ac39b 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -15,7 +15,7 @@ COPY dist/docker-compose.exe C:/app/
 COPY dist/docker-credential-portainer.exe C:/app/
 COPY dist/kubectl.exe C:/app/
 
-COPY static C:/app/static
+COPY static/ C:/app/static
 COPY config /Users/ContainerAdministrator/.docker/
 
 LABEL io.portainer.agent=true

From ea8892aefd2ae1cb61f3785b0f1bb21d5be402f8 Mon Sep 17 00:00:00 2001
From: Yajith Dayarathna <yajith.dayarathna@portainer.io>
Date: Thu, 26 Sep 2024 16:22:25 +1200
Subject: [PATCH 8/8] testing manifests

---
 build/windows/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/windows/Dockerfile b/build/windows/Dockerfile
index 191ac39b..11d59e67 100644
--- a/build/windows/Dockerfile
+++ b/build/windows/Dockerfile
@@ -15,7 +15,7 @@ COPY dist/docker-compose.exe C:/app/
 COPY dist/docker-credential-portainer.exe C:/app/
 COPY dist/kubectl.exe C:/app/
 
-COPY static/ C:/app/static
+# COPY static/ C:/app/static
 COPY config /Users/ContainerAdministrator/.docker/
 
 LABEL io.portainer.agent=true