Skip to content

dockerfile: removed unused DLLs from image for Windows Containers #10233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrick-stephens merged 4 commits into from
Nov 5, 2025
Merged

dockerfile: removed unused DLLs from image for Windows Containers #10233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7451e9
dockerfile: removed unused DLLs from image for Windows Containers.
mabrarov Apr 8, 2025
77d026d
dockerfile: fixed description of "MSVS_VERSION" build-arg.
mabrarov Jun 22, 2025
996b558
dockerfile: upgrade of vcpkg to solve msys2 package installation issu…
mabrarov Nov 4, 2025
813d3fa
ci: sanity check of the built Windows docker image.
mabrarov Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/call-build-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ jobs:
permissions:
contents: read
packages: write
env:
IMAGE: ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
steps:
- name: Checkout repository
uses: actions/checkout@v5
Expand Down Expand Up @@ -423,12 +425,19 @@ jobs:

- 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 .
docker build -t $IMAGE --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/Dockerfile.windows .
shell: bash

- name: Sanity check of the production images
run: |
docker run --rm -t $IMAGE --help
shell: bash

- name: Push the production images
if: inputs.push
run: |
docker push ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
docker push $IMAGE
shell: bash

# We cannot use this action as it requires privileged mode
# uses: docker/build-push-action@v6
Expand Down
12 changes: 3 additions & 9 deletions dockerfiles/Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN Remove-Item -Path $env:TEMP\* -Recurse -Force -ErrorAction SilentlyContinue;
Remove-Item -Path C:\Windows\Temp\* -Recurse -Force -ErrorAction SilentlyContinue; `
New-Item -ItemType Directory -Path $env:TEMP -Force -ErrorAction SilentlyContinue;

# Install Visual Studio Build Tools 2019 (MSVS_VERSION=16) / 2022 (MSVS_VERSION=17, requires WINDOWS_VERSION=ltsc2022)
# Install Visual Studio Build Tools 2019 (MSVS_VERSION=16) / 2022 (MSVS_VERSION=17)
WORKDIR /local
ARG MSVS_VERSION="17"
ENV MSVS_BUILD_TOOLS_VERSION="$MSVS_VERSION" `
Expand Down Expand Up @@ -109,8 +109,8 @@ RUN $win_flex_bison_dist_base_name=\"win_flex_bison-${env:WIN_FLEX_BISON_VERSION
Write-Host \"${env:PATH}\"; `
[Environment]::SetEnvironmentVariable(\"PATH\", \"${env:PATH}\", [EnvironmentVariableTarget]::Machine);

# https://github.com/microsoft/vcpkg/blob/2024.05.24/scripts/bootstrap.ps1
ENV VCPKG_VERSION=2024.05.24 `
# https://github.com/microsoft/vcpkg/blob/2025.10.17/scripts/bootstrap.ps1
ENV VCPKG_VERSION=2025.10.17 `
VCPKG_DOWNLOAD_URL="https://github.com/microsoft/vcpkg/archive/refs/tags" `
VCPKG_DISABLE_METRICS="ON" `
VCPKG_ROOT=/dev/vcpkg
Expand Down Expand Up @@ -160,12 +160,6 @@ RUN Remove-Item -Path C:\dev\vcpkg\downloads -Recurse -Force -ErrorAction Silent
Remove-Item -Path $env:TEMP\* -Recurse -Force -ErrorAction SilentlyContinue; `
Remove-Item -Path C:\Windows\Temp\* -Recurse -Force -ErrorAction SilentlyContinue;

# Copy required runtime libraries
WORKDIR /fluent-bit/bin
RUN Copy-Item -Path C:\Windows\System32\msvcp140.dll -Destination /fluent-bit/bin/; `
Copy-Item -Path C:\Windows\System32\vccorlib140.dll -Destination /fluent-bit/bin/; `
Copy-Item -Path C:\Windows\System32\vcruntime140.dll -Destination /fluent-bit/bin/;

FROM builder-base AS builder

# Build Fluent Bit from source - context must be the root of the Git repo
Expand Down
Loading