From 3b4657d36d148701f5cce9df1518129fa4f96cd5 Mon Sep 17 00:00:00 2001
From: Shayna Atkinson <satkinson@sphericalcowgroup.com>
Date: Sat, 30 Sep 2023 15:39:46 +0000
Subject: [PATCH] upgrade php to 8.1.23 and bump Match to v1.2.0

---
 Jenkinsfile                                  | 2 +-
 comanage-match-base/Dockerfile               | 2 +-
 comanage-match-base/README.md                | 2 +-
 comanage-match-internet2-tap-base/Dockerfile | 2 +-
 comanage-match-internet2-tap/Dockerfile      | 2 +-
 comanage-match-internet2-tap/README.md       | 4 ++--
 common.bash                                  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ee22e06..74a4ed5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         maintainer_credential_ref = 'dockerhub-tier'
         imagename = 'g'
         tag = 'l'
-        version='1.1.1'
+        version='1.2.0'
     }
     stages {
         stage('Setting build context') {
diff --git a/comanage-match-base/Dockerfile b/comanage-match-base/Dockerfile
index d06723e..38fa236 100644
--- a/comanage-match-base/Dockerfile
+++ b/comanage-match-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:8.1.21-apache-bullseye
+FROM php:8.1.23-apache-bullseye
 
 # Official PHP image with Apache HTTPD includes
 # --with-openssl
diff --git a/comanage-match-base/README.md b/comanage-match-base/README.md
index bc3df00..e5faded 100644
--- a/comanage-match-base/README.md
+++ b/comanage-match-base/README.md
@@ -53,7 +53,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_MATCH_VERSION=1.1.1
+export COMANAGE_MATCH_VERSION=1.2.0
 export COMANAGE_MATCH_BASE_IMAGE_VERSION=1
 TAG="${COMANAGE_MATCH_VERSION}-${COMANAGE_MATCH_BASE_IMAGE_VERSION}"
 docker build \
diff --git a/comanage-match-internet2-tap-base/Dockerfile b/comanage-match-internet2-tap-base/Dockerfile
index 5e25ac7..d711903 100644
--- a/comanage-match-internet2-tap-base/Dockerfile
+++ b/comanage-match-internet2-tap-base/Dockerfile
@@ -25,7 +25,7 @@ RUN yum -y remove \
     postgresql-devel \
     postgresql
 
-ARG PHP_VERSION=8.1.21
+ARG PHP_VERSION=8.1.23
 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
 
 RUN yum -y install epel-release \
diff --git a/comanage-match-internet2-tap/Dockerfile b/comanage-match-internet2-tap/Dockerfile
index 10cb84c..cbafca6 100644
--- a/comanage-match-internet2-tap/Dockerfile
+++ b/comanage-match-internet2-tap/Dockerfile
@@ -141,7 +141,7 @@ EXPOSE 80 443
 # following line (to prevent other scripts from processing it).
 #####     ENV TIER_BEACON_OPT_OUT True
 
-ENV TIER_RELEASE=230726
+ENV TIER_RELEASE=230929
 ENV TIER_MAINTAINER=tier
 
 ENTRYPOINT ["docker-supervisord-entrypoint"]
diff --git a/comanage-match-internet2-tap/README.md b/comanage-match-internet2-tap/README.md
index a3809a7..8d6c0d7 100644
--- a/comanage-match-internet2-tap/README.md
+++ b/comanage-match-internet2-tap/README.md
@@ -59,7 +59,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_MATCH_VERSION=1.1.1
+export COMANAGE_MATCH_VERSION=1.2.0
 export COMANAGE_MATCH_BASE_IMAGE_VERSION=1
 export COMANAGE_MATCH_I2_BASE_IMAGE_VERSION=1
 export COMANAGE_MATCH_I2_IMAGE_VERSION=1
@@ -133,7 +133,7 @@ docker run -d \
   -v /etc/shibboleth/my-org-metadata.xml:/etc/shibboleth/my-org-metadata.xml \
   -p 80:80 \
   -p 443:443 \
-  comanage-match:1.1.1-internet2-tap-1
+  comanage-match:1.2.0-internet2-tap-1
 ```
 
 ## Logging
diff --git a/common.bash b/common.bash
index 5b533f4..7f4d84f 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="comanage-match"
-COMANAGE_MATCH_VERSION="1.1.1"
+COMANAGE_MATCH_VERSION="1.2.0"