windows: disable unused build targets and optimise container (fluent#10136)

* windows: disable unused build targets and optimise container

Signed-off-by: Patrick Stephens <[email protected]>

Author: Pat

.github/workflows/call-build-images.yaml

@@ -401,13 +401,26 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
+
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
           username: ${{ inputs.username }}
           password: ${{ secrets.token }}
 
+      - name: Pull the last release image to speed up the build with a cache
+        continue-on-error: true
+        run: |
+          VERSION=$(gh release list --json tagName,isLatest --jq '.[] | select(.isLatest)|.tagName | sub("^v"; "")')
+          echo VERSION="$VERSION"
+          docker pull ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-$VERSION
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.token }}
+
       - name: Build the production images
         run: |
           docker build -t ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }} --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/Dockerfile.windows .

dockerfiles/Dockerfile.windows

@@ -14,7 +14,7 @@
 ARG WINDOWS_VERSION=ltsc2019
 
 # Builder Image - Windows Server Core
-FROM mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION AS builder
+FROM mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION AS builder-base
 
 RUN setx /M PATH "%PATH%;C:\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\WinFlexBison;C:\dev\vcpkg"
 
@@ -62,15 +62,29 @@ RUN `
     Rename-Item -Path /dev/vcpkg-${ENV:VCPKG_VERSION} -NewName vcpkg; `
     /dev/vcpkg/bootstrap-vcpkg.bat;
 
+# Ensure we only attempt to build release and static linking
+ENV VCPKG_BUILD_TYPE=release
+ENV VCPKG_LIBRARY_LINKAGE=static
+
 RUN vcpkg install --recurse openssl --triplet x64-windows-static; `
     vcpkg install --recurse libyaml --triplet x64-windows-static;
 
+FROM builder-base AS builder
+
 # Build Fluent Bit from source - context must be the root of the Git repo
 WORKDIR /src/build
 COPY . /src/
 
 ARG BUILD_PARALLEL=1
-RUN cmake -G "'Visual Studio 16 2019'" -DOPENSSL_ROOT_DIR='C:\dev\vcpkg\packages\openssl_x64-windows-static' -DFLB_LIBYAML_DIR='C:\dev\vcpkg\packages\libyaml_x64-windows-static' -DCMAKE_BUILD_TYPE=Release ../;`
+RUN cmake -G "'Visual Studio 16 2019'" `
+    -DOPENSSL_ROOT_DIR='C:\dev\vcpkg\packages\openssl_x64-windows-static' `
+    -DFLB_LIBYAML_DIR='C:\dev\vcpkg\packages\libyaml_x64-windows-static' `
+    -DCMAKE_BUILD_TYPE=Release `
+    -DFLB_SHARED_LIB=Off `
+    -DFLB_EXAMPLES=Off `
+    -DFLB_DEBUG=Off `
+    -DFLB_RELEASE=On `
+    ../;`
     cmake --build . --config Release -j ${BUILD_PARALLEL};
 
 # Set up config files and binaries in single /fluent-bit hierarchy for easy copy in later stage
@@ -83,8 +97,8 @@ RUN New-Item -Path  /fluent-bit/etc/ -ItemType "directory"; `
     Copy-Item -Path /src/conf/parsers_openstack.conf /fluent-bit/etc/; `
     Copy-Item -Path /src/conf/parsers_cinder.conf /fluent-bit/etc/; `
     Copy-Item -Path /src/conf/plugins.conf /fluent-bit/etc/; `
-    Copy-Item -Path /src/build/bin/Release/fluent-bit.exe /fluent-bit/bin/; `
-    Copy-Item -Path /src/build/bin/Release/fluent-bit.dll /fluent-bit/bin/;
+    Copy-Item -Path /src/build/bin/Release/fluent-bit.exe /fluent-bit/bin/;
+
 #
 # Runtime Image - Windows Server Core
 #