changes for TAP 1.1.0 release

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:7.4.30-apache-bullseye
+FROM php:8.0.27-apache-bullseye
 
 # Official PHP image with Apache HTTPD includes
 # --with-openssl

comanage-match-base/README.md

@@ -53,7 +53,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_MATCH_VERSION=1.0.0
+export COMANAGE_MATCH_VERSION=1.1.0
 export COMANAGE_MATCH_BASE_IMAGE_VERSION=1
 TAG="${COMANAGE_MATCH_VERSION}-${COMANAGE_MATCH_BASE_IMAGE_VERSION}"
 docker build \

comanage-match-internet2-tap-base/Dockerfile

@@ -25,7 +25,7 @@ RUN yum -y remove \
     postgresql-devel \
     postgresql
 
-ARG PHP_VERSION=7.4.30
+ARG PHP_VERSION=8.0.27
 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
 
 RUN yum -y install epel-release \
@@ -62,9 +62,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 \
         && ./buildconf --force \
@@ -82,6 +82,7 @@ RUN cd php-src \
             --with-password-argon2 \
             --with-pdo-pgsql=/opt/rh/rh-postgresql13/root \
             --with-pgsql=/opt/rh/rh-postgresql13/root \
+            --with-pic \
             --with-sodium \
             --with-zlib \
         && export CFLAGS="$PHP_CFLAGS" \

comanage-match-internet2-tap/10-php.conf

@@ -0,0 +1,3 @@
+<IfModule prefork.c>
+  LoadModule php_module modules/libphp.so
+</IfModule>

comanage-match-internet2-tap/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-match-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/
@@ -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=220627
+ENV TIER_RELEASE=230113
 ENV TIER_MAINTAINER=tier
 
 ENTRYPOINT ["docker-supervisord-entrypoint"]

comanage-match-internet2-tap/README.md

@@ -59,7 +59,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_MATCH_VERSION=1.0.0
+export COMANAGE_MATCH_VERSION=1.1.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.0.0-internet2-tap-1
+  comanage-match:1.1.0-internet2-tap-1
 ```
 
 ## Logging

comanage-match-postgres/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 postgres:13.7
+FROM postgres:14.4
 
 #RUN apt-get update && apt-get install -y \
     #         postgresql-contrib-9.6 \