1
0
Эх сурвалжийг харах

Merge topic 'docker-rel-linux'

2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux

Acked-by: Kitware Robot <[email protected]>
Merge-request: !3753
Brad King 6 жил өмнө
parent
commit
9141fbe0c1

+ 1 - 1
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.

+ 2 - 1
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 \
  && :