Skip to content

Commit 9a47c0d

Browse files
committed
HADOOP-19466. fix Dockerfile_windows_10
1 parent 5067082 commit 9a47c0d

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

dev-support/docker/Dockerfile_windows_10

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ 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
56+
RUN choco install sed -y
57+
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
58+
5459
RUN powershell .\vcpkg\vcpkg.exe install boost:x64-windows
5560
RUN powershell .\vcpkg\vcpkg.exe install protobuf:x64-windows
5661
RUN powershell .\vcpkg\vcpkg.exe install openssl:x64-windows
@@ -74,10 +79,10 @@ RUN powershell Expand-Archive -Path $Env:TEMP\zstd-v1.5.4-win64.zip -Destination
7479
RUN setx PATH "%PATH%;C:\ZStd"
7580

7681
# 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
82+
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
83+
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
7984
RUN powershell mkdir "C:\LibOpenSSL"
80-
RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.0-1-x86_64.pkg.tar -C "C:\LibOpenSSL"
85+
RUN powershell tar -xvf $Env:TEMP\libopenssl-3.1.0-2-x86_64.pkg.tar -C "C:\LibOpenSSL"
8186

8287
# Install libxxhash 0.8.1 needed for rsync 3.2.7.
8388
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 +91,10 @@ RUN powershell mkdir "C:\LibXXHash"
8691
RUN powershell tar -xvf $Env:TEMP\libxxhash-0.8.1-1-x86_64.pkg.tar -C "C:\LibXXHash"
8792

8893
# 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
94+
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
95+
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
9196
RUN powershell mkdir "C:\LibZStd"
92-
RUN powershell tar -xvf $Env:TEMP\libzstd-1.5.4-1-x86_64.pkg.tar -C "C:\LibZStd"
97+
RUN powershell tar -xvf $Env:TEMP\libzstd-1.5.5-1-x86_64.pkg.tar -C "C:\LibZStd"
9398

9499
# Install rsync 3.2.7.
95100
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)