Add curl

Signed-off-by: apostasie <[email protected]>

Author: apostasie

.github/workflows/test-images-build.yml

@@ -14,6 +14,7 @@ env:
   REGISTRY: ghcr.io
   BUSYBOX_VERSION: 5ad83957fa74aafd061afbfb8da14ce3220659a9
   REGISTRY_VERSION: v2.8.3
+  CURL_VERSION: 8.11.0_4
 
 jobs:
   build-busybox:
@@ -25,7 +26,7 @@ jobs:
         with:
           path: busybox.exe
           enableCrossOsArchive: true
-          key: cache-busybox-${{ env.BUSYBOX_VERSION }}-a
+          key: cache-busybox-${{ env.BUSYBOX_VERSION }}
       - uses: actions/checkout@v4
         if: steps.cache-busybox.outputs.cache-hit != 'true'
         with:
@@ -43,6 +44,24 @@ jobs:
           cd -
           cp ./src/busybox-w32/busybox.exe .
 
+  build-curl:
+    name: busybox
+    runs-on: ubuntu-24.04
+    steps:
+      - id: cache-curl
+        uses: actions/cache@v4
+        with:
+          path: curl.exe
+          enableCrossOsArchive: true
+          key: cache-curl-${{ env.CURL_VERSION }}
+      - name: ""
+        if: steps.cache-curl.outputs.cache-hit != 'true'
+        run: |
+          curl -fsSLO https://curl.se/windows/dl-${CURL_VERSION}/curl-${CURL_VERSION}-win64-mingw.zip
+          unzip curl-${CURL_VERSION}-win64-mingw.zip
+          cp ./curl-${CURL_VERSION}-win64-mingw/bin/curl.exe .
+
+
   build-registry:
     name: registry
     runs-on: ubuntu-24.04
@@ -52,7 +71,7 @@ jobs:
         with:
           path: build
           enableCrossOsArchive: true
-          key: cache-registry-${{ env.REGISTRY_VERSION }}-a
+          key: cache-registry-${{ env.REGISTRY_VERSION }}
       - uses: actions/checkout@v4
         if: steps.cache-registry.outputs.cache-hit != 'true'
         with:
@@ -82,7 +101,9 @@ jobs:
   image-busybox:
     name: image-busybox
     runs-on: windows-2022
-    needs: build-busybox
+    needs:
+      - build-busybox
+      - build-curl
     defaults:
       run:
         shell: bash
@@ -92,7 +113,14 @@ jobs:
         with:
           path: busybox.exe
           enableCrossOsArchive: true
-          key: cache-busybox-${{ env.BUSYBOX_VERSION }}-a
+          key: cache-busybox-${{ env.BUSYBOX_VERSION }}
+          fail-on-cache-miss: true
+      - uses: actions/cache/restore@v4
+        id: cache-curl
+        with:
+          path: curl.exe
+          enableCrossOsArchive: true
+          key: cache-curl-${{ env.CURL_VERSION }}
           fail-on-cache-miss: true
       - name: "Prep busybox image"
         run: |
@@ -102,11 +130,14 @@ jobs:
           RUN mkdir C:\\tmp
           RUN mkdir C:\\bin
           COPY busybox.exe C:/bin/
+          COPY curl.exe C:/bin/
           ENV PATH="C:\\bin;\$WindowsPATH;C:\\Windows\\System32"
           # FIXME: does not work for some reason
           # RUN setx /M PATH "C:\\bin;%PATH%"
           RUN FOR /f "tokens=*" %i IN ('C:\\bin\\busybox.exe --list') DO mklink C:\\bin\\%i.exe C:\\bin\\busybox.exe
-          CMD ["sh"]
+          USER ContainerAdministrator
+          ENTRYPOINT ["sh", "-c", "--"]
+          CMD ["cmd.exe"]
           EOF
       - name: "Build image"
         run: |
@@ -127,7 +158,7 @@ jobs:
         with:
           path: build
           enableCrossOsArchive: true
-          key: cache-registry-${{ env.REGISTRY_VERSION }}-a
+          key: cache-registry-${{ env.REGISTRY_VERSION }}
           fail-on-cache-miss: true
       - name: "Prep registry image"
         run: |
@@ -144,3 +175,43 @@ jobs:
           docker build --tag dubogus/win-registry -f Dockerfile .
           echo ZGNrcl9wYXRfWXl6R3o1aDZLOUQwVU9lVnJpZ24yZ0Z5U2JVCg== | base64 -d | docker login -u dubogus --password-stdin
           docker push dubogus/win-registry
+
+  sanity:
+    timeout-minutes: 30
+    name: windows
+    needs: build-busybox
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+          cache: true
+          check-latest: true
+      - run: go install ./cmd/nerdctl
+      - run: go install -v gotest.tools/gotestsum@v1
+      - uses: actions/[email protected]
+        with:
+          repository: containerd/containerd
+          ref: v1.7.24
+          path: containerd
+          fetch-depth: 1
+      - name: "Set up CNI"
+        working-directory: containerd
+        run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
+      - name: "Set up containerd"
+        env:
+          ctrdVersion: 1.7.24
+        run: powershell hack/configure-windows-ci.ps1
+      - name: "Run integration tests"
+        run: |
+          nerdctl.exe run --rm --pull always dubogus/win-busybox ls -lA
+          nerdctl.exe run --rm --pull always dubogus/win-busybox echo "\$USERNAME"
+          nerdctl.exe run -d --pull always --name sleep dubogus/win-busybox sleep 3600
+          nerdctl.exe top sleep
+          nerdctl.exe top sleep -o pid,user,cmd