Skip to content

Commit 5ec3dc2

Browse files
committed
HADOOP-19538. Update Boost to 1.86.0 in Windows build image
1 parent 4452980 commit 5ec3dc2

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

dev-support/docker/Dockerfile_windows_10

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,13 @@ RUN powershell Copy-Item -Recurse -Path 'C:\Program Files\Git' -Destination C:\G
4949
# hadolint ignore=DL3003
5050
RUN powershell git clone https://github.com/microsoft/vcpkg.git \
5151
&& cd vcpkg \
52-
&& git checkout 7ffa425e1db8b0c3edf9c50f2f3a0f25a324541d \
52+
&& git fetch --all \
53+
&& git checkout 2025.03.19 \
5354
&& .\bootstrap-vcpkg.bat
5455

55-
# Fix wrong download link for 7-zip in .\vcpkg\scripts\vcpkgTools.xml:
56-
# - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 (not working anymore) is replaced with
57-
# - https://globalcdn.nuget.org/packages/7-zip.commandline.18.1.0.nupkg?packageVersion=18.1.0 (working)
58-
# Replacing is done using the Linux tool "sed".
59-
RUN choco install sed -y
60-
RUN sed -i "s,https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0,https://globalcdn.nuget.org/packages/7-zip.commandline.18.1.0.nupkg?packageVersion=18.1.0,g" .\vcpkg\scripts\vcpkgTools.xml
61-
62-
RUN powershell .\vcpkg\vcpkg.exe install boost:x64-windows
63-
RUN powershell .\vcpkg\vcpkg.exe install protobuf:x64-windows
64-
RUN powershell .\vcpkg\vcpkg.exe install openssl:x64-windows
65-
RUN powershell .\vcpkg\vcpkg.exe install zlib:x64-windows
56+
ADD vcpkg.json .
57+
58+
RUN powershell .\vcpkg\vcpkg.exe install --x-install-root .\vcpkg\installed
6659

6760
# Install Azul Java 8 JDK.
6861
RUN powershell Invoke-WebRequest -URI https://cdn.azul.com/zulu/bin/zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip -OutFile $Env:TEMP\zulu8.62.0.19-ca-jdk8.0.332-win_x64.zip

dev-support/docker/vcpkg.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3+
"dependencies": [
4+
"boost",
5+
"protobuf",
6+
"openssl",
7+
"zlib"
8+
],
9+
"builtin-baseline": "289a69379604112a433874fe8b9812dad3103341",
10+
"overrides": [
11+
{
12+
"name": "protobuf",
13+
"version": "3.21.12"
14+
}
15+
]
16+
}

0 commit comments

Comments
 (0)