add docker to image for D-In-D builds, update main.yml

Author: AnastaZIuk

.github/workflows/main.yml

@@ -10,6 +10,10 @@ jobs:
   build-and-push:
     runs-on: windows-2022
 
+    env:
+      entry: pwsh.exe
+      cmd: -NoLogo -NoProfile -ExecutionPolicy Bypass
+
     outputs:
       image_tagged: ${{ steps.vars.outputs.image_tagged }}
 
@@ -60,20 +64,20 @@ jobs:
     - name: Pull Image
       run: docker pull "${{ needs.build-and-push.outputs.image_tagged }}"
 
-    - name: Run Nano Container
-      run: docker run --isolation process -di --name orphan "${{ needs.build-and-push.outputs.image_tagged }}"
+    - name: Run Container
+      run: docker run --entrypoint ${{ env.entry }} --isolation process -di --name orphan "${{ needs.build-and-push.outputs.image_tagged }}" ${{ env.cmd }}
 
-    - name: Inspect Nano Container
+    - name: Inspect Container
       run: docker inspect orphan
 
-    - name: Nano Container - Unpack Artifacts
-      run: docker exec orphan pwsh -c "C:\unpack.ps1"
+    - name: Container – Unpack Packages
+      run: docker exec orphan ${{ env.entry }} ${{ env.cmd }} C:\unpack.ps1
 
-    - name: Nano Container - Configure CMake Project
-      run: docker exec orphan cmake --preset configure-msvc-winsdk
+    - name: Container – Configure CMake Project
+      run: docker exec orphan ${{ env.entry }} ${{ env.cmd }} -Command cmake --preset configure-msvc-winsdk
 
-    - name: Nano Container - Build the Project
-      run: docker exec orphan cmake --build --preset build-msvc-winsdk --config Release -- -j 14
+    - name: Container – Build Sample Project
+      run: docker exec orphan ${{ env.entry }} ${{ env.cmd }} -Command cmake --build --preset build-msvc-winsdk --config Release -- -j 14
 
-    - name: Nano Container - Test the Project
-      run: docker exec -w "C:\sample\tests\build-ct\src" orphan ctest -C Release --stop-on-failure --verbose
+    - name: Container – Test Sample Project
+      run: docker exec -w "C:\sample\tests\build-ct\src" orphan ${{ env.entry }} ${{ env.cmd }} -Command ctest -C Release --stop-on-failure --verbose

Dockerfile

@@ -14,6 +14,7 @@ ARG VC_VERSION=14.43.17.13
 ARG VS_BOOTSTRAP_VERSION=17.13.6
 ARG VULKAN_SDK_VERSION=1.4.313.0
 ARG NINJATRACING_VERSION=0.0.2
+ARG DOCKER_VERSION=28.1.1
 
 # note: it seems we cannot pass version within any workflow ID to installer, though as I look at VS package cache I see it being done in json payloads! 
 # henceforth we enforce fixed versions with nasty bootstrap URL, more details:
@@ -222,6 +223,19 @@ Invoke-WebRequest -Uri "https://github.com/git-for-windows/git/releases/download
 tar -xf C:\Temp\git.zip -C $env:IMPL_ARTIFACTS_DIR ; `
 Remove-Item C:\Temp\git.zip
 
+# ---------------- DOCKER ----------------
+FROM ${IMPL_NANO_BASE}:${IMPL_NANO_TAG} as docker
+SHELL ["pwsh", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command"]
+
+ARG DOCKER_VERSION
+ARG IMPL_ARTIFACTS_DIR
+
+RUN Write-Host "Installing Docker $env:DOCKER_VERSION" ; `
+New-Item -ItemType Directory -Force -Path C:\Temp, $env:IMPL_ARTIFACTS_DIR ; `
+Invoke-WebRequest -Uri "https://download.docker.com/win/static/stable/x86_64/docker-$env:DOCKER_VERSION.zip" -OutFile C:\Temp\docker.zip ; `
+tar -xf C:\Temp\docker.zip -C $env:IMPL_ARTIFACTS_DIR ; `
+Remove-Item C:\Temp\docker.zip
+
 # ---------------- ZSTD ----------------
 FROM ${IMPL_NANO_BASE}:${IMPL_NANO_TAG} as zstd
 SHELL ["pwsh", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command"]
@@ -249,6 +263,7 @@ COPY --link --from=ninja ["${IMPL_ARTIFACTS_DIR}", "C:/pack/Ninja"]
 COPY --link --from=ninjatracing ["${IMPL_ARTIFACTS_DIR}", "C:/pack/NinjaTracing"]
 COPY --link --from=nasm ["${IMPL_ARTIFACTS_DIR}", "C:/pack/Nasm"]
 COPY --link --from=git ["${IMPL_ARTIFACTS_DIR}", "C:/pack/Git"]
+COPY --link --from=docker ["${IMPL_ARTIFACTS_DIR}", "C:/pack/Docker"]
 COPY --link --from=zstd ["${IMPL_ARTIFACTS_DIR}", "C:/compress"]
 
 ARG ZSTD_VERSION
@@ -297,6 +312,7 @@ ARG VS_BOOTSTRAP_VERSION
 ARG VULKAN_SDK_VERSION
 ARG NINJATRACING_VERSION
 ARG ZSTD_VERSION
+ARG DOCKER_VERSION
 
 ENV CMAKE_WINDOWS_KITS_10_DIR="C:\WindowsKits10SDK" `
 CMAKE_VERSION=${CMAKE_VERSION} `
@@ -314,9 +330,11 @@ BUILD_TOOLS_URL=${BUILD_TOOLS_URL} `
 VS_BOOTSTRAP_VERSION=${VS_BOOTSTRAP_VERSION} `
 VULKAN_SDK_VERSION=${VULKAN_SDK_VERSION} `
 NINJATRACING_VERSION=${NINJATRACING_VERSION} `
+ZSTD_VERSION=${ZSTD_VERSION} `
+DOCKER_VERSION=${DOCKER_VERSION} `
 MSVC_TOOLSET_DIR=C:\BuildTools\VC\Tools\MSVC\${MSVC_VERSION} `
 LLVM_TOOLSET_DIR=C:\BuildTools\VC\Tools\Llvm `
-PATH="C:\Windows\system32;C:\Windows;C:\Program Files\PowerShell;C:\Git\cmd;C:\Git\bin;C:\Git\usr\bin;C:\Git\mingw64\bin;C:\CMake\cmake-${CMAKE_VERSION}-windows-x86_64\bin;C:\Python;C:\Nasm;C:\Nasm\nasm-${NASM_VERSION};C:\Ninja;C:\compress\zstd-v${ZSTD_VERSION}-win64;C:\vulkan-sdk\Bin;C:\NinjaTracing\ninjatracing-${NINJATRACING_VERSION}"
+PATH="C:\Windows\system32;C:\Windows;C:\Program Files\PowerShell;C:\Git\cmd;C:\Git\bin;C:\Git\usr\bin;C:\Git\mingw64\bin;C:\CMake\cmake-${CMAKE_VERSION}-windows-x86_64\bin;C:\Python;C:\Nasm;C:\Nasm\nasm-${NASM_VERSION};C:\Ninja;C:\compress\zstd-v${ZSTD_VERSION}-win64;C:\vulkan-sdk\Bin;C:\NinjaTracing\ninjatracing-${NINJATRACING_VERSION};C:\Docker\docker"
 
 COPY . sample/
 COPY unpack.ps1 .