Skip to content

HADOOP-19538. Update Boost to 1.86.0 in Windows build image #7601

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
merged 3 commits into from
Apr 17, 2025
Merged

HADOOP-19538. Update Boost to 1.86.0 in Windows build image #7601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ec3dc2
HADOOP-19538. Update Boost to 1.86.0 in Windows build image
stoty Apr 11, 2025
0758cd6
add vcpkg.json to the RAT exclude list, and move it into a subdirectory
stoty Apr 14, 2025
e6a3134
fix rat exclude path
stoty Apr 15, 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
17 changes: 5 additions & 12 deletions dev-support/docker/Dockerfile_windows_10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,13 @@ RUN powershell Copy-Item -Recurse -Path 'C:\Program Files\Git' -Destination C:\G
# hadolint ignore=DL3003
RUN powershell git clone https://github.com/microsoft/vcpkg.git \
&& cd vcpkg \
&& git checkout 7ffa425e1db8b0c3edf9c50f2f3a0f25a324541d \
&& git fetch --all \
&& git checkout 2025.03.19 \
&& .\bootstrap-vcpkg.bat

# Fix wrong download link for 7-zip in .\vcpkg\scripts\vcpkgTools.xml:
# - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 (not working anymore) is replaced with
# - https://globalcdn.nuget.org/packages/7-zip.commandline.18.1.0.nupkg?packageVersion=18.1.0 (working)
# Replacing is done using the Linux tool "sed".
RUN choco install sed -y
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

RUN powershell .\vcpkg\vcpkg.exe install boost:x64-windows
RUN powershell .\vcpkg\vcpkg.exe install protobuf:x64-windows
RUN powershell .\vcpkg\vcpkg.exe install openssl:x64-windows
RUN powershell .\vcpkg\vcpkg.exe install zlib:x64-windows
ADD vcpkg/vcpkg.json .

RUN powershell .\vcpkg\vcpkg.exe install --x-install-root .\vcpkg\installed

# Install Azul Java 8 JDK.
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
Expand Down
16 changes: 16 additions & 0 deletions dev-support/docker/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"dependencies": [
"boost",
"protobuf",
"openssl",
"zlib"
],
"builtin-baseline": "289a69379604112a433874fe8b9812dad3103341",
"overrides": [
{
"name": "protobuf",
"version": "3.21.12"
}
]
}
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
<exclude>licenses-binary/**</exclude>
<exclude>dev-support/docker/pkg-resolver/packages.json</exclude>
<exclude>dev-support/docker/pkg-resolver/platforms.json</exclude>
<exclude>dev-support/docker/vcpkg/vcpkg.json</exclude>
<exclude>**/target/**</exclude>
</excludes>
</configuration>
Expand Down