diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-03 10:55:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-03 10:55:35 (GMT) |
| commit | f0e97788e59dc72f08c7e80a9aea2d0a32694e2f (patch) | |
| tree | eea9cefada33763f88067900956677ce5a2ed10d | |
| parent | b44624e0ca916a6d5d6b4c5c86cf0fe9d613efaa (diff) | |
| parent | 3a66c7674c6be298216a6ea0ce9560e4cd89ee5f (diff) | |
| download | CMake-f0e97788e59dc72f08c7e80a9aea2d0a32694e2f.zip CMake-f0e97788e59dc72f08c7e80a9aea2d0a32694e2f.tar.gz CMake-f0e97788e59dc72f08c7e80a9aea2d0a32694e2f.tar.bz2 | |
Merge topic 'rel-linux-openssl'
3a66c7674c Utilities/Release: Update to openssl 1.1.1f
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4563
| -rw-r--r-- | Utilities/Release/linux/x86_64/Dockerfile | 4 | ||||
| -rw-r--r-- | Utilities/Release/linux/x86_64/deps/Dockerfile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Utilities/Release/linux/x86_64/Dockerfile b/Utilities/Release/linux/x86_64/Dockerfile index 1ba753c..41391d2 100644 --- a/Utilities/Release/linux/x86_64/Dockerfile +++ b/Utilities/Release/linux/x86_64/Dockerfile @@ -5,8 +5,8 @@ # Build using the CMake source directory as the build context. # The resulting image will have an '/out' directory containing the package. -ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2019-08-09 -ARG FROM_IMAGE_DIGEST=@sha256:630c320b26a67fc584e0bc98314f1fb0cb0abc764348bb2613ef07437f7101f9 +ARG FROM_IMAGE_NAME=kitware/cmake:build-linux-x86_64-deps-2020-04-02 +ARG FROM_IMAGE_DIGEST=@sha256:77e9ab183f34680990db9da5945473e288f0d6556bce79ecc1589670d656e157 ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST FROM $FROM_IMAGE diff --git a/Utilities/Release/linux/x86_64/deps/Dockerfile b/Utilities/Release/linux/x86_64/deps/Dockerfile index db5551c..7864aac 100644 --- a/Utilities/Release/linux/x86_64/deps/Dockerfile +++ b/Utilities/Release/linux/x86_64/deps/Dockerfile @@ -129,10 +129,10 @@ COPY openssl-source.patch /opt/openssl/src/ RUN : \ && mkdir -p /opt/openssl/src \ && cd /opt/openssl/src \ - && curl -O https://www.openssl.org/source/openssl-1.1.1c.tar.gz \ - && sha512sum openssl-1.1.1c.tar.gz | grep -q 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff \ - && tar xzf openssl-1.1.1c.tar.gz \ - && cd openssl-1.1.1c \ + && curl -O https://www.openssl.org/source/openssl-1.1.1f.tar.gz \ + && sha512sum openssl-1.1.1f.tar.gz | grep -q b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c \ + && tar xzf openssl-1.1.1f.tar.gz \ + && cd openssl-1.1.1f \ && patch -p1 -i ../openssl-source.patch \ && source /opt/rh/devtoolset-6/enable \ && ./Configure --prefix=/opt/openssl linux-elf no-asm no-shared -D_POSIX_C_SOURCE=199506L -D_POSIX_SOURCE=1 -D_SVID_SOURCE=1 -D_BSD_SOURCE=1 \ |