From c6e91be16ad7ec6af8b64862a470de658c710bec Mon Sep 17 00:00:00 2001
From: Shayna Atkinson <satkinson@sphericalcowgroup.com>
Date: Tue, 6 Dec 2022 23:09:41 +0000
Subject: [PATCH] Updates for Registry 4.1.0-rc1

---
 Jenkinsfile                                      | 2 +-
 comanage-registry-base/Dockerfile                | 2 +-
 comanage-registry-internet2-tier-base/Dockerfile | 7 ++++---
 comanage-registry-internet2-tier/10-php.conf     | 3 +++
 comanage-registry-internet2-tier/Dockerfile      | 6 +++---
 common.bash                                      | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 comanage-registry-internet2-tier/10-php.conf

diff --git a/Jenkinsfile b/Jenkinsfile
index 89b6e0c..2048845 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         maintainer_credential_ref = 'dockerhub-tier'
         imagename = 'g'
         tag = 'l'
-        version='4.0.2'
+        version='4.1.0-rc1'
     }
     stages {
         stage('Setting build context') {
diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile
index 03c0add..fe8586f 100644
--- a/comanage-registry-base/Dockerfile
+++ b/comanage-registry-base/Dockerfile
@@ -16,7 +16,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM php:7.4.33-apache-bullseye
+FROM php:8.0.26-apache-bullseye
 
 # Official PHP image with Apache HTTPD includes
 # --with-openssl
diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile
index beaaf94..8d216ff 100644
--- a/comanage-registry-internet2-tier-base/Dockerfile
+++ b/comanage-registry-internet2-tier-base/Dockerfile
@@ -25,7 +25,7 @@ RUN yum -y remove \
     postgresql-devel \
     postgresql
 
-ARG PHP_VERSION=7.4.33
+ARG PHP_VERSION=8.0.26
 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
 
 RUN yum -y install epel-release \
@@ -61,9 +61,9 @@ RUN mkdir php-src \
         && tar zxf php-src.tar.gz -C php-src --strip-components=1 \
         && rm php-src.tar.gz
 
-ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2"
+ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 ENV PHP_CPPFLAGS="$PHP_CFLAGS"
-ENV PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie"
+ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 RUN cd php-src \
         && source scl_source enable rh-postgresql13 \
@@ -88,6 +88,7 @@ RUN cd php-src \
             --with-sodium \
             --with-xsl \
             --with-zlib \
+	    --with-pic \
         && export CFLAGS="$PHP_CFLAGS" \
         && export CPPFLAGS="$PHP_CPPFLAGS" \
         && export LDFLAGS="$PHP_LDFLAGS" \
diff --git a/comanage-registry-internet2-tier/10-php.conf b/comanage-registry-internet2-tier/10-php.conf
new file mode 100644
index 0000000..cff579f
--- /dev/null
+++ b/comanage-registry-internet2-tier/10-php.conf
@@ -0,0 +1,3 @@
+<IfModule prefork.c>
+  LoadModule php_module modules/libphp.so
+</IfModule>
diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
index 9fb82df..25312d9 100644
--- a/comanage-registry-internet2-tier/Dockerfile
+++ b/comanage-registry-internet2-tier/Dockerfile
@@ -75,7 +75,7 @@ RUN yum -y update && yum -y install \
     && pip install supervisor \
     && yum clean -y all
 
-COPY --from=php-build /usr/lib64/httpd/modules/libphp7.so /usr/lib64/httpd/modules/
+COPY --from=php-build /usr/lib64/httpd/modules/libphp.so /usr/lib64/httpd/modules/
 COPY --from=php-build /usr/local/lib/php /usr/local/lib/php/
 COPY --from=php-build /usr/local/include/php /usr/local/include/php/
 COPY --from=php-build /usr/local/bin /usr/local/bin/
@@ -89,7 +89,7 @@ COPY --from=comanage /usr/local/lib/comanage_shibboleth_sp_utils.sh /usr/local/l
 COPY --from=comanage /usr/local/bin/docker-comanage-entrypoint /usr/local/bin/
 
 COPY 000-comanage.conf /etc/httpd/conf.d/
-COPY 10-php7.conf /etc/httpd/conf.modules.d/
+COPY 10-php.conf /etc/httpd/conf.modules.d/
 COPY php.conf /etc/httpd/conf.d/
 COPY supervisord.conf /usr/local/etc/supervisord.conf
 COPY shibd.logger /etc/shibboleth/
@@ -145,7 +145,7 @@ EXPOSE 80 443
 # following line (to prevent other scripts from processing it).
 #####     ENV TIER_BEACON_OPT_OUT True
 
-ENV TIER_RELEASE=22021117
+ENV TIER_RELEASE=20221206
 ENV TIER_MAINTAINER=tier
 
 WORKDIR /srv/comanage-registry
diff --git a/common.bash b/common.bash
index 4a7058f..d698802 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="comanage-registry"
-COMANAGE_REGISTRY_VERSION="4.0.2"
+COMANAGE_REGISTRY_VERSION="4.1.0-rc1"