Skip to content

Commit acc3e50

Browse files
authored
HADOOP-19466. fix Dockerfile_windows_10 (#7417)
* This PR fixes a few outdated dependencies needed for the Hadoop build environment on Windows.
1 parent 1a81c3b commit acc3e50

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

dev-support/docker/Dockerfile_windows_10

+14-6
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ RUN powershell git clone https://github.com/microsoft/vcpkg.git \
5151
&& cd vcpkg \
5252
&& git checkout 7ffa425e1db8b0c3edf9c50f2f3a0f25a324541d \
5353
&& .\bootstrap-vcpkg.bat
54+
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+
5462
RUN powershell .\vcpkg\vcpkg.exe install boost:x64-windows
5563
RUN powershell .\vcpkg\vcpkg.exe install protobuf:x64-windows
5664
RUN powershell .\vcpkg\vcpkg.exe install openssl:x64-windows
@@ -74,10 +82,10 @@ RUN powershell Expand-Archive -Path $Env:TEMP\zstd-v1.5.4-win64.zip -Destination
7482
RUN setx PATH "%PATH%;C:\ZStd"
7583

7684
# Install libopenssl 3.1.0 needed for rsync 3.2.7.
77-
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.0-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.0-1-x86_64.pkg.tar.zst
78-
RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.0-1-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.0-1-x86_64.pkg.tar
85+
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libopenssl-3.1.0-2-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar.zst
86+
RUN powershell zstd -d $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar.zst -o $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar
7987
RUN powershell mkdir "C:\LibOpenSSL"
80-
RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.0-1-x86_64.pkg.tar -C "C:\LibOpenSSL"
88+
RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar -C "C:\LibOpenSSL"
8189

8290
# Install libxxhash 0.8.1 needed for rsync 3.2.7.
8391
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libxxhash-0.8.1-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libxxhash-0.8.1-1-x86_64.pkg.tar.zst
@@ -86,10 +94,10 @@ RUN powershell mkdir "C:\LibXXHash"
8694
RUN powershell tar -xvf $Env:TEMP\libxxhash-0.8.1-1-x86_64.pkg.tar -C "C:\LibXXHash"
8795

8896
# Install libzstd 1.5.4 needed for rsync 3.2.7.
89-
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libzstd-1.5.4-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libzstd-1.5.4-1-x86_64.pkg.tar.zst
90-
RUN powershell zstd -d $Env:TEMP\libzstd-1.5.4-1-x86_64.pkg.tar.zst -o $Env:TEMP\libzstd-1.5.4-1-x86_64.pkg.tar
97+
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/libzstd-1.5.5-1-x86_64.pkg.tar.zst -OutFile $Env:TEMP\libzstd-1.5.5-1-x86_64.pkg.tar.zst
98+
RUN powershell zstd -d $Env:TEMP\libzstd-1.5.5-1-x86_64.pkg.tar.zst -o $Env:TEMP\libzstd-1.5.5-1-x86_64.pkg.tar
9199
RUN powershell mkdir "C:\LibZStd"
92-
RUN powershell tar -xvf $Env:TEMP\libzstd-1.5.4-1-x86_64.pkg.tar -C "C:\LibZStd"
100+
RUN powershell tar -xvf $Env:TEMP\libzstd-1.5.5-1-x86_64.pkg.tar -C "C:\LibZStd"
93101

94102
# Install rsync 3.2.7.
95103
RUN powershell Invoke-WebRequest -Uri https://repo.msys2.org/msys/x86_64/rsync-3.2.7-2-x86_64.pkg.tar.zst -OutFile $Env:TEMP\rsync-3.2.7-2-x86_64.pkg.tar.zst

0 commit comments

Comments
 (0)