Fix base-windows Dockerfile and script (antrea-io#4369)

CNI_BINARIES_VERSION is missing when building windows-golang and antrea/base-windows images, leading to CNI binaries missing in the target image. The issue was not discovered because the curl command used in the Dockerfile ignored HTTP 404 code and didn't fail the build. The patch adds the missing argument and makes curl command fail on HTTP errors. Signed-off-by: Quan Tian <[email protected]>
tnqn · Nov 7, 2022 · 16fde23 · 16fde23
1 parent a776ad0
commit 16fde23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/build/images/base-windows/Dockerfile b/build/images/base-windows/Dockerfile
@@ -28,20 +28,20 @@ WORKDIR /
 
 RUN mkdir -Force C:\opt\cni\bin
 
-RUN curl.exe -LO https://github.com/containernetworking/plugins/releases/download/${env:CNI_BINARIES_VERSION}/cni-plugins-windows-amd64-${env:CNI_BINARIES_VERSION}.tgz; \
+RUN curl.exe -fLO https://github.com/containernetworking/plugins/releases/download/${env:CNI_BINARIES_VERSION}/cni-plugins-windows-amd64-${env:CNI_BINARIES_VERSION}.tgz; \
     tar -xzf cni-plugins-windows-amd64-${env:CNI_BINARIES_VERSION}.tgz  -C C:\opt\cni\bin ${env:CNI_PLUGINS}; \
     rm cni-plugins-windows-amd64-${env:CNI_BINARIES_VERSION}.tgz
 
 # Install 7zip, git-for-windows, mingw64 to support "make tool"
-RUN curl.exe -LO https://www.7-zip.org/a/7z2107-x64.exe; \
+RUN curl.exe -fLO https://www.7-zip.org/a/7z2107-x64.exe; \
     cmd /c start /wait 7z2107-x64.exe /S; \
     del 7z2107-x64.exe;  $env:Path = $env:Path+';C:/Program Files/7-Zip'; \
-    curl.exe -Lo mingw.7z https://cfhcable.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z; \
+    curl.exe -fLo mingw.7z https://cfhcable.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z; \
     7z x mingw.7z; cp c:/mingw64/bin/mingw32-make.exe c:/mingw64/bin/make.exe; \
-    curl.exe -Lo git.exe https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-64-bit.7z.exe; \
+    curl.exe -fLo git.exe https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-64-bit.7z.exe; \
     7z x git.exe -oC:\git; \
     mkdir C:\wins; \
-    curl.exe -Lo C:/wins/wins.exe https://github.com/rancher/wins/releases/download/v0.0.4/wins.exe
+    curl.exe -fLo C:/wins/wins.exe https://github.com/rancher/wins/releases/download/v0.0.4/wins.exe
 
 FROM golang:${GO_VERSION}-nanoserver as windows-golang
 

diff --git a/hack/build-antrea-windows-all.sh b/hack/build-antrea-windows-all.sh
@@ -92,13 +92,15 @@ docker build --target windows-utility-base \
 docker build --target windows-golang \
        --cache-from antrea/windows-golang:$WIN_BUILD_TAG \
        -t antrea/windows-golang:$WIN_BUILD_TAG \
+       --build-arg CNI_BINARIES_VERSION=$CNI_BINARIES_VERSION \
        --build-arg GO_VERSION=$GO_VERSION \
        --build-arg NANOSERVER_VERSION=$NANOSERVER_VERSION .
 docker build \
        --cache-from antrea/windows-utility-base:$WIN_BUILD_TAG \
        --cache-from antrea/windows-golang:$WIN_BUILD_TAG \
        --cache-from antrea/base-windows:$WIN_BUILD_TAG \
        -t antrea/base-windows:$WIN_BUILD_TAG \
+       --build-arg CNI_BINARIES_VERSION=$CNI_BINARIES_VERSION \
        --build-arg GO_VERSION=$GO_VERSION \
        --build-arg NANOSERVER_VERSION=$NANOSERVER_VERSION .
 cd -