From b8f9d1a2b71686bbdb4a1e4f6d1823348fa30783 Mon Sep 17 00:00:00 2001
From: MaxymVlasov <MaxymVlasov@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:21:59 +0200
Subject: [PATCH 01/32] fix: Add tests for arm64 and for macOS

---
 .github/workflows/build-image-test.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 1b263ce46..a111f5f2c 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -7,7 +7,12 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        arch: [amd64, arm64]
+
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:

From 51116cb2fabf58e3194adb99d2e396791bb2429c Mon Sep 17 00:00:00 2001
From: MaxymVlasov <MaxymVlasov@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:31:56 +0200
Subject: [PATCH 02/32] fix issues with docker on macos arm

---
 .github/workflows/build-image-test.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index a111f5f2c..47a1d4e73 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -28,6 +28,13 @@ jobs:
             tools/entrypoint.sh
             .github/workflows/build-image-test.yaml
 
+      - name: Setup docker (missing on MacOS)
+        if: runner.os == 'macos'
+        run: |
+          brew install docker
+          colima start
+
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 

From df7d5868b45a1954b110984941e11a66b75c4315 Mon Sep 17 00:00:00 2001
From: MaxymVlasov <MaxymVlasov@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:39:12 +0200
Subject: [PATCH 03/32] Build multiarch only in ubuntu amd64

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 47a1d4e73..61930fb19 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -73,7 +73,7 @@ jobs:
       # Can't build both platforms and use --load at the same time
       # https://github.com/docker/buildx/issues/59#issuecomment-1433097926
       - name: Build Multi-arch docker-image
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
+        if: steps.changed-files-specific.outputs.any_changed == 'true' && runner.os == 'ubuntu' && matrix.arch == 'amd64'
         uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
         with:
           context: .

From 5583e992c3f141a2436106fdfc958731ffee86d2 Mon Sep 17 00:00:00 2001
From: MaxymVlasov <MaxymVlasov@users.noreply.github.com>
Date: Fri, 23 Feb 2024 23:45:32 +0200
Subject: [PATCH 04/32] f

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 61930fb19..9a53bf978 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -73,7 +73,7 @@ jobs:
       # Can't build both platforms and use --load at the same time
       # https://github.com/docker/buildx/issues/59#issuecomment-1433097926
       - name: Build Multi-arch docker-image
-        if: steps.changed-files-specific.outputs.any_changed == 'true' && runner.os == 'ubuntu' && matrix.arch == 'amd64'
+        if: steps.changed-files-specific.outputs.any_changed == 'true' && matrix.os == 'ubuntu-latest' && matrix.arch == 'amd64'
         uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
         with:
           context: .

From 9cac10832abe2e58a094ef491c7cacf89bac35e4 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 22:57:04 +0000
Subject: [PATCH 05/32] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .github/workflows/build-image-test.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 8a29474e8..7bf342431 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -29,11 +29,11 @@ jobs:
         - os-name: Ubuntu ARM
           os: ubuntu-24.04-arm
           arch: arm64
-          
+
         - os-name: MacOS x64
           os: macos-latest
           arch: amd64
-          
+
          - os-name: MacOS ARM
           os: macos-latest
           arch: amd64
@@ -63,13 +63,13 @@ jobs:
       run: >-
         echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY@L}:${{ env.IMAGE_TAG }}"
         >> $GITHUB_ENV
- 
+
     - name: Setup docker (missing on MacOS)
         if: matrix.os == 'macos'
         run: |
           brew install docker
           colima start
-  
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From 9ec3aac969172065e154a8346faba7e976cf6928 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 01:59:32 +0300
Subject: [PATCH 06/32] Update .github/workflows/build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 7bf342431..8668b2f93 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -34,7 +34,7 @@ jobs:
           os: macos-latest
           arch: amd64
 
-         - os-name: MacOS ARM
+       - os-name: MacOS ARM
           os: macos-latest
           arch: amd64
 

From 677118cd8638db0c54c3e55ccc49ed0025e774a2 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:00:19 +0300
Subject: [PATCH 07/32] Update .github/workflows/build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 8668b2f93..327875db7 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -34,7 +34,7 @@ jobs:
           os: macos-latest
           arch: amd64
 
-       - os-name: MacOS ARM
+        - os-name: MacOS ARM
           os: macos-latest
           arch: amd64
 

From 61bce200b7026f2b37eb8b65de52345309e23043 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:01:38 +0300
Subject: [PATCH 08/32] Update .github/workflows/build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 327875db7..f1e95cd05 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -65,11 +65,10 @@ jobs:
         >> $GITHUB_ENV
 
     - name: Setup docker (missing on MacOS)
-        if: matrix.os == 'macos'
-        run: |
-          brew install docker
-          colima start
-
+      if: matrix.os == 'macos'
+      run: |
+        brew install docker
+        colima start
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From 5badac2e87855a169b08680049290665dac547e7 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:02:46 +0300
Subject: [PATCH 09/32] Update .github/workflows/build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index f1e95cd05..63e28e9ec 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -65,7 +65,7 @@ jobs:
         >> $GITHUB_ENV
 
     - name: Setup docker (missing on MacOS)
-      if: matrix.os == 'macos'
+      if: runner.os == 'macos'
       run: |
         brew install docker
         colima start

From 98fb3974f7d4da3c78b6739164e87a3228fe1803 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:12:46 +0300
Subject: [PATCH 10/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 63e28e9ec..3e9ff47ef 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -61,7 +61,7 @@ jobs:
       # Lowercase the org/repo name to allow for workflow to run in forks,
       # which owners have uppercase letters in username
       run: >-
-        echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY@L}:${{ env.IMAGE_TAG }}"
+        echo "IMAGE=ghcr.io/${{ github.repository | lower }}:${{ env.IMAGE_TAG }}"
         >> $GITHUB_ENV
 
     - name: Setup docker (missing on MacOS)

From ecbad249ad9b5cbda69033a50750a7fb3096435f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 23:13:05 +0000
Subject: [PATCH 11/32] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .github/workflows/build-image-test.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 3e9ff47ef..93a4d7839 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -61,7 +61,8 @@ jobs:
       # Lowercase the org/repo name to allow for workflow to run in forks,
       # which owners have uppercase letters in username
       run: >-
-        echo "IMAGE=ghcr.io/${{ github.repository | lower }}:${{ env.IMAGE_TAG }}"
+        echo "IMAGE=ghcr.io/${{ github.repository | lower }}:${{ env.IMAGE_TAG
+        }}"
         >> $GITHUB_ENV
 
     - name: Setup docker (missing on MacOS)

From aede65137a517ae852b035996a62f6c6babf2772 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:17:10 +0300
Subject: [PATCH 12/32] Update .github/workflows/build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 93a4d7839..607ad17c3 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -36,7 +36,7 @@ jobs:
 
         - os-name: MacOS ARM
           os: macos-latest
-          arch: amd64
+          arch: arm64
 
     name: ${{ matrix.os-name }}
     runs-on: ${{ matrix.os }}

From 6e9722c6fc45c1282ecd61ea051c0604158e5873 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:26:01 +0300
Subject: [PATCH 13/32] Update .github/workflows/build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 607ad17c3..47e8e9c7a 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -61,7 +61,8 @@ jobs:
       # Lowercase the org/repo name to allow for workflow to run in forks,
       # which owners have uppercase letters in username
       run: >-
-        echo "IMAGE=ghcr.io/${{ github.repository | lower }}:${{ env.IMAGE_TAG
+        repo=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')
+        echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}"
         }}"
         >> $GITHUB_ENV
 

From 53088bd18f39e0ea8205b8a5ff6f35b9e7edf09a Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:29:36 +0300
Subject: [PATCH 14/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 47e8e9c7a..62d88d63f 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -60,11 +60,9 @@ jobs:
       if: steps.changed-files-specific.outputs.any_changed == 'true'
       # Lowercase the org/repo name to allow for workflow to run in forks,
       # which owners have uppercase letters in username
-      run: >-
+      run: |-
         repo=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')
-        echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}"
-        }}"
-        >> $GITHUB_ENV
+        echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
 
     - name: Setup docker (missing on MacOS)
       if: runner.os == 'macos'

From 1b9668ba1548daa15b5c2e107b209e4eac8f2ba3 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:31:38 +0300
Subject: [PATCH 15/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 62d88d63f..84a3f58a6 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -68,7 +68,7 @@ jobs:
       if: runner.os == 'macos'
       run: |
         brew install docker
-        colima start
+        #colima start
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From 2d34d2f780158b042d4a9eff59f63128c76a1f9d Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:34:36 +0300
Subject: [PATCH 16/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 84a3f58a6..2d6891b8f 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -67,8 +67,8 @@ jobs:
     - name: Setup docker (missing on MacOS)
       if: runner.os == 'macos'
       run: |
-        brew install docker
-        #colima start
+        brew install docker colima
+        colima start
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From dfcdca3c7507b3a05cc1ae666fbdfb1705bc9044 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:42:41 +0300
Subject: [PATCH 17/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 2d6891b8f..f8a48637e 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -31,11 +31,11 @@ jobs:
           arch: arm64
 
         - os-name: MacOS x64
-          os: macos-latest
+          os: macos-13
           arch: amd64
 
         - os-name: MacOS ARM
-          os: macos-latest
+          os: macos-13
           arch: arm64
 
     name: ${{ matrix.os-name }}

From 8332068e1d0c45ab9c598a7af7551d582a2eaa36 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 02:46:59 +0300
Subject: [PATCH 18/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index f8a48637e..228d8cd57 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -64,11 +64,10 @@ jobs:
         repo=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')
         echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
 
-    - name: Setup docker (missing on MacOS)
-      if: runner.os == 'macos'
-      run: |
-        brew install docker colima
-        colima start
+    - name: Setup Docker on macOS
+      if: runner.os == 'macOS'
+      uses: douglascamata/setup-docker-macos-action@v1.0.0
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From f1f1f7043c060c97e6501a2d577356edc95bdc1a Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 03:03:02 +0300
Subject: [PATCH 19/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 228d8cd57..c66a0a3e2 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -18,24 +18,31 @@ jobs:
 
     strategy:
       matrix:
+        os-type:
+        - ubuntu
+        - macos
         arch:
         - amd64
         - arm64
         include:
         - os-name: Ubuntu x64
           os: ubuntu-latest
+          os-type: ubuntu
           arch: amd64
 
         - os-name: Ubuntu ARM
           os: ubuntu-24.04-arm
+          os-type: ubuntu
           arch: arm64
 
         - os-name: MacOS x64
           os: macos-13
+          os-type: macos
           arch: amd64
 
         - os-name: MacOS ARM
           os: macos-13
+          os-type: macos
           arch: arm64
 
     name: ${{ matrix.os-name }}
@@ -65,7 +72,7 @@ jobs:
         echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
 
     - name: Setup Docker on macOS
-      if: runner.os == 'macOS'
+      if: matrix.os-type == 'macos'
       uses: douglascamata/setup-docker-macos-action@v1.0.0
 
     - name: Set up Docker Buildx

From 31d95c0539ec0ac29cb7ebf278602a23975d1825 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 11:51:52 +0300
Subject: [PATCH 20/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index c66a0a3e2..b6ef9c5d3 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -17,6 +17,7 @@ jobs:
       pull-requests: write
 
     strategy:
+      fail-fast: false
       matrix:
         os-type:
         - ubuntu

From 7d216efbfae95be9752fb6e47cfad3df78995c37 Mon Sep 17 00:00:00 2001
From: MaxymVlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 20:27:38 +0300
Subject: [PATCH 21/32] fix container-structure-test

---
 .github/workflows/build-image-test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index b6ef9c5d3..9bf07751e 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -28,22 +28,22 @@ jobs:
         include:
         - os-name: Ubuntu x64
           os: ubuntu-latest
-          os-type: ubuntu
+          os-type: linux
           arch: amd64
 
         - os-name: Ubuntu ARM
           os: ubuntu-24.04-arm
-          os-type: ubuntu
+          os-type: linux
           arch: arm64
 
         - os-name: MacOS x64
           os: macos-13
-          os-type: macos
+          os-type: darwin
           arch: amd64
 
         - os-name: MacOS ARM
           os: macos-13
-          os-type: macos
+          os-type: darwin
           arch: arm64
 
     name: ${{ matrix.os-name }}
@@ -104,8 +104,8 @@ jobs:
         CST_REPO: github.com/GoogleContainerTools/container-structure-test
       run: >-
         curl -L "https://${{ env.CST_REPO }}/releases/download/v${{
-        env.CST_VERSION }}/container-structure-test-linux-${{ matrix.arch }}"
-        > container-structure-test
+        env.CST_VERSION }}/container-structure-test-${{
+        matrix.os-type }}-${{ matrix.arch }}" > container-structure-test
         && chmod +x container-structure-test
         && mkdir -p $HOME/bin/
         && mv container-structure-test $HOME/bin/

From d2f9601d17910629a7dc2251a4b9385b0de37992 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 21:53:50 +0300
Subject: [PATCH 22/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 9bf07751e..6fb9b594a 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -19,12 +19,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os-type:
-        - ubuntu
-        - macos
-        arch:
-        - amd64
-        - arm64
         include:
         - os-name: Ubuntu x64
           os: ubuntu-latest

From e50e8100cb17ac2a4b2b607bd529f69ccbf8e2c7 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 21:56:03 +0300
Subject: [PATCH 23/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 6fb9b594a..9e02ea464 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -67,7 +67,7 @@ jobs:
         echo "IMAGE=ghcr.io/${repo}:${{ env.IMAGE_TAG }}" >> $GITHUB_ENV
 
     - name: Setup Docker on macOS
-      if: matrix.os-type == 'macos'
+      if: matrix.os-type == 'darwin'
       uses: douglascamata/setup-docker-macos-action@v1.0.0
 
     - name: Set up Docker Buildx

From 0c36c1f229bc2f0112e2d06b405cf3e61f727e0b Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Wed, 28 May 2025 23:07:44 +0300
Subject: [PATCH 24/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 9e02ea464..2a997bf57 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -36,7 +36,7 @@ jobs:
           arch: amd64
 
         - os-name: MacOS ARM
-          os: macos-13
+          os: macos-14
           os-type: darwin
           arch: arm64
 

From f7b31a70f6b4e0016c14c43ba9c31f4e09fac555 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Thu, 29 May 2025 04:06:44 +0300
Subject: [PATCH 25/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 2a997bf57..9e02ea464 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -36,7 +36,7 @@ jobs:
           arch: amd64
 
         - os-name: MacOS ARM
-          os: macos-14
+          os: macos-13
           os-type: darwin
           arch: arm64
 

From 525825cb083dab8a1d12c5100fd7c10d15a1cf26 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sat, 31 May 2025 00:14:48 +0300
Subject: [PATCH 26/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 9e02ea464..229bdfea0 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -70,6 +70,15 @@ jobs:
       if: matrix.os-type == 'darwin'
       uses: douglascamata/setup-docker-macos-action@v1.0.0
 
+   - name: Set DOCKER_HOST to point to Colima's socket
+     if: matrix.os-type == 'darwin'
+     run: |
+          # Colima usually creates the socket at ~/.colima/default/docker.sock
+          # The `colima env` command can give you the exact DOCKER_HOST value
+          DOCKER_SOCKET_PATH=$(colima env --shell bash | grep DOCKER_HOST | cut -d'=' -f2 | tr -d '"')
+          echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
+          docker info # Verify Docker daemon is accessible
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0
       if: steps.changed-files-specific.outputs.any_changed == 'true'

From b760886e0c87620c4a9119d5221cac85a866666f Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sat, 31 May 2025 00:18:54 +0300
Subject: [PATCH 27/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 229bdfea0..f5f9e4437 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -70,14 +70,14 @@ jobs:
       if: matrix.os-type == 'darwin'
       uses: douglascamata/setup-docker-macos-action@v1.0.0
 
-   - name: Set DOCKER_HOST to point to Colima's socket
-     if: matrix.os-type == 'darwin'
-     run: |
-          # Colima usually creates the socket at ~/.colima/default/docker.sock
-          # The `colima env` command can give you the exact DOCKER_HOST value
-          DOCKER_SOCKET_PATH=$(colima env --shell bash | grep DOCKER_HOST | cut -d'=' -f2 | tr -d '"')
-          echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
-          docker info # Verify Docker daemon is accessible
+    - name: Set DOCKER_HOST to point to Colima's socket
+      if: matrix.os-type == 'darwin'
+      run: |
+        # Colima usually creates the socket at ~/.colima/default/docker.sock
+        # The `colima env` command can give you the exact DOCKER_HOST value
+        DOCKER_SOCKET_PATH=$(colima env --shell bash | grep DOCKER_HOST | cut -d'=' -f2 | tr -d '"')
+        echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
+        docker info # Verify Docker daemon is accessible
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0

From a2bc4dd2c4eae1e98b8412b959da95f1a3a01f29 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sat, 31 May 2025 00:51:48 +0300
Subject: [PATCH 28/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index f5f9e4437..7d6288786 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -73,11 +73,13 @@ jobs:
     - name: Set DOCKER_HOST to point to Colima's socket
       if: matrix.os-type == 'darwin'
       run: |
+        docker context ls
         # Colima usually creates the socket at ~/.colima/default/docker.sock
         # The `colima env` command can give you the exact DOCKER_HOST value
         DOCKER_SOCKET_PATH=$(colima env --shell bash | grep DOCKER_HOST | cut -d'=' -f2 | tr -d '"')
         echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
         docker info # Verify Docker daemon is accessible
+        docker context ls
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0

From 4df69be1a87e42664cb1fc211bbdf2f2c97cd085 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sat, 31 May 2025 01:07:38 +0300
Subject: [PATCH 29/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 7d6288786..7fe847f2a 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -75,11 +75,11 @@ jobs:
       run: |
         docker context ls
         # Colima usually creates the socket at ~/.colima/default/docker.sock
-        # The `colima env` command can give you the exact DOCKER_HOST value
-        DOCKER_SOCKET_PATH=$(colima env --shell bash | grep DOCKER_HOST | cut -d'=' -f2 | tr -d '"')
+        DOCKER_SOCKET_PATH=$(docker context ls | awk '{print $3}' | grep colima)
         echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
-        docker info # Verify Docker daemon is accessible
+        docker
         docker context ls
+        echo "DOCKER_HOST=$DOCKER_SOCKET_PATH"
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2  # v3.10.0

From bbf10212008c5d681c98cc13d7274592d1243574 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sat, 31 May 2025 01:15:42 +0300
Subject: [PATCH 30/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 7fe847f2a..968d0225c 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -75,7 +75,7 @@ jobs:
       run: |
         docker context ls
         # Colima usually creates the socket at ~/.colima/default/docker.sock
-        DOCKER_SOCKET_PATH=$(docker context ls | awk '{print $3}' | grep colima)
+        DOCKER_SOCKET_PATH=$(docker context ls | awk '{print $4}' | grep colima)
         echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
         docker
         docker context ls

From dc6a9394277f3a817d60c31e33a23bb0efae341f Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sun, 1 Jun 2025 01:54:22 +0300
Subject: [PATCH 31/32] Update build-image-test.yaml

---
 .github/workflows/build-image-test.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 968d0225c..7eb6d0578 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -100,6 +100,11 @@ jobs:
         secrets: |
           "github_token=${{ secrets.GITHUB_TOKEN }}"
 
+    - name: Doxker inpect (debug)
+      run: |
+        docker images
+        docker images -q | xargs docker inspect
+
     - name: Setup Container Structure Tests
       if: steps.changed-files-specific.outputs.any_changed == 'true'
       env:

From 948df60a77b6e4a4817ff33473f856ae75e296e6 Mon Sep 17 00:00:00 2001
From: Maksym Vlasov <MaxymVlasov@users.noreply.github.com>
Date: Sun, 1 Jun 2025 02:29:33 +0300
Subject: [PATCH 32/32] Update build-image-test.yaml

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

diff --git a/.github/workflows/build-image-test.yaml b/.github/workflows/build-image-test.yaml
index 7eb6d0578..41b85342a 100644
--- a/.github/workflows/build-image-test.yaml
+++ b/.github/workflows/build-image-test.yaml
@@ -77,7 +77,7 @@ jobs:
         # Colima usually creates the socket at ~/.colima/default/docker.sock
         DOCKER_SOCKET_PATH=$(docker context ls | awk '{print $4}' | grep colima)
         echo "DOCKER_HOST=$DOCKER_SOCKET_PATH" >> $GITHUB_ENV
-        docker
+        docker info
         docker context ls
         echo "DOCKER_HOST=$DOCKER_SOCKET_PATH"