summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-21 14:13:31 -0400
committerBrad King <brad.king@kitware.com>2022-03-21 14:13:31 -0400
commitf71e89ae423ad5168509d252e79f460026400768 (patch)
tree6966089a540196b61e0d9b2e0460ca86f82c4542
parent12e03d7051b3b466d5755976f50152f307eea6e6 (diff)
parenta6aa88e51fdb11765e4685735054df8c1eef63ce (diff)
downloadcmake-f71e89ae423ad5168509d252e79f460026400768.tar.gz
Merge branch 'rel-win-docker' into release-3.21
Merge-request: !7087
-rw-r--r--Utilities/Release/win/x86/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/Release/win/x86/Dockerfile b/Utilities/Release/win/x86/Dockerfile
index a4f7445783..d5a036a795 100644
--- a/Utilities/Release/win/x86/Dockerfile
+++ b/Utilities/Release/win/x86/Dockerfile
@@ -11,8 +11,10 @@ ARG FROM_IMAGE_NAME=kitware/cmake:build-win-x86-deps-2020-04-27
ARG FROM_IMAGE_DIGEST=@sha256:04e229c0c0ba2247855d0e8c0fb87c1686f983adbafa4ce413e61b3905edb76b
ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST
-FROM $FROM_IMAGE as build
+FROM $FROM_IMAGE as source
COPY . C:\cmake\src\cmake
+
+FROM source as build
ARG ARCH="x86_64"
ARG TEST="true"
RUN \cmake\src\cmake\Utilities\Release\win\x86\build.bat %ARCH% %TEST%