From 5b82c5a13178eddb99d5e19105b3eb200a108df5 Mon Sep 17 00:00:00 2001
From: Shayna Atkinson <satkinson@sphericalcowgroup.com>
Date: Thu, 3 Nov 2022 20:46:57 +0000
Subject: [PATCH] Pull in new Shibboleth SP and update PHP
---
comanage-registry-base/Dockerfile | 2 +-
comanage-registry-internet2-tier-base/Dockerfile | 4 +++-
comanage-registry-internet2-tier/Dockerfile | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile
index e43f0fb..03c0add 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.3.33-apache-bullseye
+FROM php:7.4.33-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 7c4ef32..beaaf94 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.3.33
+ARG PHP_VERSION=7.4.33
ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
RUN yum -y install epel-release \
@@ -45,6 +45,7 @@ RUN yum -y update \
libxslt-devel \
make \
mariadb-devel \
+ oniguruma-devel \
openldap-devel \
openssl-devel \
rh-postgresql13 \
@@ -107,6 +108,7 @@ RUN rm -rf php-src \
libxslt-devel \
make \
mariadb-devel \
+ oniguruma-devel \
openldap-devel \
openssl-devel \
postgresql-devel \
diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
index 80c0877..99d0fcf 100644
--- a/comanage-registry-internet2-tier/Dockerfile
+++ b/comanage-registry-internet2-tier/Dockerfile
@@ -144,7 +144,7 @@ EXPOSE 80 443
# following line (to prevent other scripts from processing it).
##### ENV TIER_BEACON_OPT_OUT True
-ENV TIER_RELEASE=220223
+ENV TIER_RELEASE=22021103
ENV TIER_MAINTAINER=tier
WORKDIR /srv/comanage-registry