From 34f2394fa5e21e388c6ad40fd01e5beb481dd6b5 Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Thu, 28 Oct 2021 14:28:41 -0500
Subject: [PATCH] Better linking against PostgreSQL 13

Better linking against the PostgreSQL 13 libraries for
the TAP image.
---
 comanage-registry-internet2-tier-base/Dockerfile    | 13 ++++++++++---
 comanage-registry-internet2-tier/Dockerfile         |  5 +++++
 .../docker-supervisord-entrypoint                   |  3 +++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile
index 29747c0..7d4e780 100644
--- a/comanage-registry-internet2-tier-base/Dockerfile
+++ b/comanage-registry-internet2-tier-base/Dockerfile
@@ -20,6 +20,11 @@ FROM centos/python-38-centos7 AS php-build
 
 USER root
 
+RUN yum -y remove \
+    postgresql-libs \
+    postgresql-devel \
+    postgresql
+
 ARG PHP_VERSION=7.3.31
 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
 
@@ -42,7 +47,8 @@ RUN yum -y update \
             mariadb-devel \
             openldap-devel \
             openssl-devel \
-            rh-postgresql13-devel \
+            rh-postgresql13 \
+            rh-postgresql13-postgresql-devel \
             re2c \
             wget \
         && yum clean all
@@ -59,6 +65,7 @@ ENV PHP_CPPFLAGS="$PHP_CFLAGS"
 ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
 
 RUN cd php-src \
+        && source scl_source enable rh-postgresql13 \
         && ./buildconf --force \
         && ./configure \
             --disable-cgi \
@@ -75,8 +82,8 @@ RUN cd php-src \
             --with-openssl \
             --with-password-argon2 \
             --with-pdo-mysql \
-            --with-pdo-pgsql \
-            --with-pgsql \
+            --with-pdo-pgsql=/opt/rh/rh-postgresql13/root \
+            --with-pgsql=/opt/rh/rh-postgresql13/root \
             --with-sodium \
             --with-xsl \
             --with-zlib \
diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
index 078a2a4..c354e9d 100644
--- a/comanage-registry-internet2-tier/Dockerfile
+++ b/comanage-registry-internet2-tier/Dockerfile
@@ -44,6 +44,11 @@ ARG COMANAGE_REGISTRY_DIR
 ENV COMANAGE_REGISTRY_DIR ${COMANAGE_REGISTRY_DIR:-/srv/comanage-registry}
 LABEL comanage_registry_dir=${COMANAGE_REGISTRY_DIR}
 
+RUN yum -y remove \
+    postgresql-libs \
+    postgresql-devel \
+    postgresql
+
 RUN yum -y install epel-release
 
 COPY shibboleth.repo /etc/yum.repos.d/
diff --git a/comanage-registry-internet2-tier/docker-supervisord-entrypoint b/comanage-registry-internet2-tier/docker-supervisord-entrypoint
index a1f871e..7d66311 100755
--- a/comanage-registry-internet2-tier/docker-supervisord-entrypoint
+++ b/comanage-registry-internet2-tier/docker-supervisord-entrypoint
@@ -56,5 +56,8 @@ ln -s /tmp/logcrond /var/log/cron > "$OUTPUT" 2>&1
 exec 1<&-
 exec 2<&-
 
+# Enable the SCL PostgreSQL installation
+source scl_source enable rh-postgresql13
+
 # Start supervisord
 exec /opt/app-root/bin/supervisord -c /usr/local/etc/supervisord.conf