Browse Source

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

Istvan Toth 2 weeks ago
parent
commit
263404e108
3 changed files with 22 additions and 12 deletions
  1. 5 12
      dev-support/docker/Dockerfile_windows_10
  2. 16 0
      dev-support/docker/vcpkg/vcpkg.json
  3. 1 0
      pom.xml

+ 5 - 12
dev-support/docker/Dockerfile_windows_10

@@ -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

+ 16 - 0
dev-support/docker/vcpkg/vcpkg.json

@@ -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 - 0
pom.xml

@@ -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>