From 9d130bdecff5028574b894922bc0d722a296542e Mon Sep 17 00:00:00 2001
From: Alvin Moore <alvinm@apple.com>
Date: Thu, 24 Sep 2020 19:23:56 -0400
Subject: [PATCH] Updated OpenSsl version from 1.1.1d to 1.1.1h

---
 build/Dockerfile          | 12 ++++++------
 build/Dockerfile.devel    |  2 +-
 build/docker-compose.yaml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index e99c45357d..ad9669fba9 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -45,13 +45,13 @@ RUN cd /tmp && curl -L https://github.com/ninja-build/ninja/archive/v1.9.0.zip -
     cd .. && rm -rf ninja-1.9.0 ninja.zip
 
 # install openssl
-RUN cd /tmp && curl -L https://www.openssl.org/source/openssl-1.1.1d.tar.gz -o openssl.tar.gz &&\
-    echo "1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2  openssl.tar.gz" > openssl-sha.txt &&\
+RUN cd /tmp && curl -L https://www.openssl.org/source/openssl-1.1.1h.tar.gz -o openssl.tar.gz &&\
+    echo "5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9  openssl.tar.gz" > openssl-sha.txt &&\
     sha256sum -c openssl-sha.txt && tar -xzf openssl.tar.gz &&\
-    cd openssl-1.1.1d && scl enable devtoolset-8 -- ./config CFLAGS="-fPIC -O3" --prefix=/usr/local &&\
+    cd openssl-1.1.1h && scl enable devtoolset-8 -- ./config CFLAGS="-fPIC -O3" --prefix=/usr/local &&\
     scl enable devtoolset-8 -- make -j`nproc` && scl enable devtoolset-8 -- make -j1 install &&\
     ln -sv /usr/local/lib64/lib*.so.1.1 /usr/lib64/ &&\
-    cd /tmp/ && rm -rf /tmp/openssl-1.1.1d /tmp/openssl.tar.gz
+    cd /tmp/ && rm -rf /tmp/openssl-1.1.1h /tmp/openssl.tar.gz
 
 RUN cd /opt/ && curl -L https://github.com/facebook/rocksdb/archive/v6.10.1.tar.gz -o rocksdb.tar.gz &&\
     echo "d573d2f15cdda883714f7e0bc87b814a8d4a53a82edde558f08f940e905541ee  rocksdb.tar.gz" > rocksdb-sha.txt &&\
@@ -61,8 +61,8 @@ RUN cd /opt/ && curl -L https://github.com/facebook/rocksdb/archive/v6.10.1.tar.
 ARG TIMEZONEINFO=America/Los_Angeles
 RUN rm -f /etc/localtime && ln -s /usr/share/zoneinfo/${TIMEZONEINFO} /etc/localtime
 
-LABEL version=0.1.15
-ENV DOCKER_IMAGEVER=0.1.15
+LABEL version=0.1.17
+ENV DOCKER_IMAGEVER=0.1.17
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
 ENV CC=/opt/rh/devtoolset-8/root/usr/bin/gcc
 ENV CXX=/opt/rh/devtoolset-8/root/usr/bin/g++
diff --git a/build/Dockerfile.devel b/build/Dockerfile.devel
index 9552a064dc..a88e79b7f4 100644
--- a/build/Dockerfile.devel
+++ b/build/Dockerfile.devel
@@ -1,4 +1,4 @@
-FROM foundationdb/foundationdb-build:0.1.15
+FROM foundationdb/foundationdb-build:0.1.17
 
 USER root
 
diff --git a/build/docker-compose.yaml b/build/docker-compose.yaml
index aa86bf741a..0856057f4b 100644
--- a/build/docker-compose.yaml
+++ b/build/docker-compose.yaml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   common: &common
-    image: foundationdb/foundationdb-build:0.1.15
+    image: foundationdb/foundationdb-build:0.1.17
 
   build-setup: &build-setup
     <<: *common