Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
         maintainer_credential_ref = 'dockerhub-tier'
         imagename = 'g'
         tag = 'l'
-        version='1.2.0'
+        version='1.2.1'
     }
     stages {
         stage('Setting build context') {

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.23-apache-bullseye
+FROM php:8.1.26-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.2.0
+export COMANAGE_MATCH_VERSION=1.2.1
 export COMANAGE_MATCH_BASE_IMAGE_VERSION=1
 TAG="${COMANAGE_MATCH_VERSION}-${COMANAGE_MATCH_BASE_IMAGE_VERSION}"
 docker build \

comanage-match-base/apache-include-virtual-host-port443-base

@@ -7,6 +7,7 @@ RedirectMatch ^/$ /match/
 LogLevel warn
 
 Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains"
+Header set Content-Security-Policy "frame-ancestors 'self';"
 
 SSLEngine on
 SSLProtocol all -SSLv2 -SSLv3

comanage-match-base/apache-include-virtual-host-port80-redirect

@@ -1,5 +1,6 @@
 <VirtualHost *:80>
 ServerName http://${COMANAGE_MATCH_VIRTUAL_HOST_FQDN}:80
+Header set Content-Security-Policy "frame-ancestors 'self';"
 RewriteEngine On
 RewriteCond %{HTTPS} off
 RewriteRule ^ https://%{HTTP_HOST}:443%{REQUEST_URI} [R=302,L,QSA]

comanage-match-internet2-tap-base/Dockerfile

@@ -25,7 +25,7 @@ RUN yum -y remove \
     postgresql-devel \
     postgresql
 
-ARG PHP_VERSION=8.1.23
+ARG PHP_VERSION=8.1.26
 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz
 
 RUN yum -y install epel-release \

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=230929
+ENV TIER_RELEASE=231211
 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.2.0
+export COMANAGE_MATCH_VERSION=1.2.1
 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.2.0-internet2-tap-1
+  comanage-match:1.2.1-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:14.4
+FROM postgres:14.10
 
 #RUN apt-get update && apt-get install -y \
     #         postgresql-contrib-9.6 \

common.bash

@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="comanage-match"
-COMANAGE_MATCH_VERSION="1.2.0"
+COMANAGE_MATCH_VERSION="1.2.1"