summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-30 14:35:00 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-08-30 14:35:09 (GMT)
commit9141fbe0c1fc85a90cab3f1cf72739df712ca54d (patch)
treea56307ae35d46b5add9a894375d030ca9b6d03fc /Utilities
parent8720353d4adfa83295d136835f44dce0173efd79 (diff)
parent2c95c35c51c09ffcdaf1135489a6864cee02ff4f (diff)
downloadCMake-9141fbe0c1fc85a90cab3f1cf72739df712ca54d.zip
CMake-9141fbe0c1fc85a90cab3f1cf72739df712ca54d.tar.gz
CMake-9141fbe0c1fc85a90cab3f1cf72739df712ca54d.tar.bz2
Merge topic 'docker-rel-linux'
2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3753
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/Release/README.rst2
-rw-r--r--Utilities/Release/linux/x86_64/Dockerfile3
2 files changed, 3 insertions, 2 deletions
diff --git a/Utilities/Release/README.rst b/Utilities/Release/README.rst
index e7f0eb3..de294d1 100644
--- a/Utilities/Release/README.rst
+++ b/Utilities/Release/README.rst
@@ -34,7 +34,7 @@ may use to produce Linux binaries for CMake:
-f cmake-src/Utilities/Release/linux/$arch/Dockerfile cmake-src
$ docker container create --name cmake-build cmake:build
$ docker cp cmake-build:/out .
- $ ls out/cmake-*-Linux-$arch.tar.gz
+ $ ls out/cmake-*-Linux-$arch.*
* ``linux/<arch>/test/Dockerfile``:
Produces a base image with a test environment for packaged CMake binaries.
diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile
index f3ba69c..1ba753c 100644
--- a/Utilities/Release/linux/x86_64/Dockerfile
+++ b/Utilities/Release/linux/x86_64/Dockerfile
@@ -29,7 +29,8 @@ RUN : \
bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|CMakeServerLib\.|RunCMake\.ctest_memcheck)'; \
fi \
&& bin/cpack -G TGZ \
+ && bin/cpack -G STGZ \
&& set +x \
&& mkdir /out \
- && mv cmake-*-Linux-x86_64.tar.gz /out \
+ && mv cmake-*-Linux-x86_64.* /out \
&& :