Fix netapi load for deps

Author: sixeyed

.github/workflows/push-manifests.yaml

@@ -1,4 +1,4 @@
-name: images-push-manifests
+name: push-manifests
 
 on:
   push:
@@ -33,5 +33,5 @@ jobs:
       - name: Push chapter manifests
         uses: ./.github/actions/push-manifests
         with:
-          images: 'false'
-          chapters: 'true'
+          images: "false"
+          chapters: "true"

build/.env

@@ -40,4 +40,5 @@ NGINX_VERSION=1.27.4
 TRAEFIK_VERSION=2.11.21
 REDIS_VERSION=7.4.2
 NATS_VERSION=2.10.26
-LIBRESSL_VERSION=2.5.5
+LIBRESSL_VERSION=2.5.5
+WINDOWS_NETAPI_SKU=servercore

build/build.ps1

@@ -35,6 +35,7 @@ try {
     if ($env:DOCKER_BUILD_OS -eq 'windows') {
         $env:WINDOWS_VERSION='ltsc2019'
         $env:WINDOWS_VERSION_CODE='1809'
+        $env:WINDOWS_NETAPI_SKU='servercore'
         $winver=(Get-Item "HKLM:SOFTWARE\Microsoft\Windows NT\CurrentVersion").GetValue('DisplayVersion')
         echo "** winver: $winver **"
         # yuck - https://www.gaijin.at/en/infos/windows-version-numbers
@@ -45,6 +46,7 @@ try {
         } 
         elseif ($version -eq '10.0.26100.0') {
             $env:WINDOWS_VERSION = $env:WINDOWS_VERSION_CODE ='ltsc2025'
+            $env:WINDOWS_NETAPI_SKU = 'nanoserver'
         }
         $env:OS_VERSION_TAG="-$env:WINDOWS_VERSION"
     }

build/compose-images-windows.yml

@@ -8,6 +8,7 @@ services:
         GIT_WINDOWS_VERSION: ${GIT_WINDOWS_VERSION}
         GIT_WINDOWS_RELEASE_NUMBER: ${GIT_WINDOWS_RELEASE_NUMBER}
         GIT_WINDOWS_DOWNLOAD_SHA256: ${GIT_WINDOWS_DOWNLOAD_SHA256}
+        WINDOWS_NETAPI_SKU: ${WINDOWS_NETAPI_SKU}
 
   base:
     build:
@@ -48,8 +49,6 @@ services:
       args:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
         GIT_VERSION: ${GIT_VERSION}
-        GIT_WINDOWS_RELEASE_NUMBER: ${GIT_WINDOWS_RELEASE_NUMBER}
-        GIT_WINDOWS_DOWNLOAD_SHA256: ${GIT_WINDOWS_DOWNLOAD_SHA256}
 
   dotnet-runtime:
     build:
@@ -88,21 +87,18 @@ services:
       context: ../images/prometheus/windows
       args:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
-        PROMETHEUS_WINDOWS_DOWNLOAD_SHA256: ${PROMETHEUS_WINDOWS_DOWNLOAD_SHA256}
 
   grafana:
     build:
       context: ../images/grafana/windows
       args:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
-        GRAFANA_WINDOWS_DOWNLOAD_SHA256: ${GRAFANA_WINDOWS_DOWNLOAD_SHA256}
 
   gogs:
     build:
       context: ../images/gogs/windows
       args:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
-        GOGS_WINDOWS_DOWNLOAD_SHA256: ${GOGS_WINDOWS_DOWNLOAD_SHA256}
 
   jenkins:
     build:
@@ -119,7 +115,7 @@ services:
         MSSQL_VERSION_CODE: ${MSSQL_VERSION_CODE}
         MSSQL_INSTANCE_NAME: ${MSSQL_INSTANCE_NAME}
         SQLPACKAGE_DOWNLOAD_URL: ${SQLPACKAGE_WINDOWS_DOWNLOAD_URL}
-  
+
   #TODO
   #trivy:
   #  build:
@@ -131,17 +127,17 @@ services:
       args:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
 
-# TODO
- # elasticsearch:
- #   build:
- #     context: ../images/elasticsearch/linux
- #     args:
- #       DOCKER_BUILD_CPU_ALT: ${DOCKER_BUILD_CPU_ALT}
+  # TODO
+  # elasticsearch:
+  #   build:
+  #     context: ../images/elasticsearch/linux
+  #     args:
+  #       DOCKER_BUILD_CPU_ALT: ${DOCKER_BUILD_CPU_ALT}
 
-# TODO
- # kibana:
+  # TODO
+  # kibana:
 
- # nginx:
+  # nginx:
 
   cert-generator:
     build:
@@ -150,6 +146,6 @@ services:
         WINDOWS_VERSION: ${WINDOWS_VERSION}
         LIBRESSL_VERSION: ${LIBRESSL_VERSION}
 
- # redis
+  # redis
 
- # nats
+  # nats

images/windows-deps/Dockerfile

@@ -1,9 +1,10 @@
 #escape=`
 ARG WINDOWS_VERSION
+ARG WINDOWS_NETAPI_SKU
+
 FROM mcr.microsoft.com/windows/servercore:${WINDOWS_VERSION} AS servercore
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-
 FROM servercore AS vcredist
 RUN Invoke-WebRequest -OutFile VC_redist.x64.exe 'https://aka.ms/vs/17/release/VC_redist.x64.exe'
 RUN Start-Process .\VC_redist.x64.exe -ArgumentList '/install /passive /norestart' -Wait
@@ -26,13 +27,13 @@ RUN Write-Host 'Expanding Git...'; `
     if ((Get-FileHash git.7z.exe -Algorithm sha256).Hash.ToLower() -ne $env:GIT_WINDOWS_DOWNLOAD_SHA256) {exit 1}; `
     & 'C:\Program Files\7-Zip\7z.exe' x -oC:\git .\git.7z.exe
 
+FROM mcr.microsoft.com/windows/${WINDOWS_NETAPI_SKU}:${WINDOWS_VERSION} AS netapi
 
 # windows-deps
-ARG WINDOWS_VERSION
 FROM mcr.microsoft.com/windows/nanoserver:${WINDOWS_VERSION}
 
 COPY --from=git /git /git
 COPY --from=servercore /Windows/System32/nslookup.exe /nslookup.exe
-COPY --from=servercore /windows/system32/netapi32.dll  /windows/system32/netapi32.dll
+COPY --from=netapi /windows/system32/netapi32.dll  /windows/system32/netapi32.dll
 COPY --from=vcredist C:\windows\system32\msvcp140.dll C:\windows\system32
 COPY --from=vcredist C:\windows\system32\vcruntime140.dll C:\windows\system32