Merge pull request #39 from murraystevenson/openssl11Symlinks

Dockerfile : Make `openssl11` discoverable by Python
GafferHQ · Feb 19, 2024 · b59277f · b59277f
2 parents b97be09 + 2a5a1ea
commit b59277f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,10 @@
+2.x.x
+=====
+
+- Dockerfile :
+  - Removed `openssl-devel` package.
+  - Symlinked `openssl11-devel` headers and libraries into `/usr/local/ssl` so they can be automatically found when building Python.
+
 2.1.1
 =====
 

diff --git a/Dockerfile b/Dockerfile
@@ -104,10 +104,15 @@ RUN yum install -y yum-versionlock && \
 #	Install Python dependencies (needed for Python ssl and sqlite3 modules)
 #
 	yum install -y \
-		openssl-devel \
 		openssl11-devel \
 		sqlite-devel && \
 #
+#	Symlink openssl11 libs and headers to a location where Python's `configure` script can find them
+#
+	mkdir /usr/local/ssl && \
+	ln -s /usr/lib64/openssl11 /usr/local/ssl/lib && \
+	ln -s /usr/include/openssl11 /usr/local/ssl/include && \
+#
 # Install packages needed to generate the
 # Gaffer documentation.
 #

diff --git a/yum-versionlock.list b/yum-versionlock.list
@@ -346,9 +346,8 @@
 1:libvorbis-1.3.3-8.el7.1.*
 1:make-3.82-24.el7.*
 1:numpy-1.7.1-13.el7.*
-1:openssl11-devel-1.1.1k-6.el7.*
-1:openssl11-libs-1.1.1k-6.el7.*
-1:openssl-devel-1.0.2k-26.el7_9.*
+1:openssl11-devel-1.1.1k-7.el7.*
+1:openssl11-libs-1.1.1k-7.el7.*
 1:perl-Error-0.17020-2.el7.*
 1:perl-parent-0.225-244.el7.*
 1:perl-Pod-Escapes-1.04-299.el7_9.*