change PHP version to 8.0.28; bump Registry version to 4.1.2

docker · Mar 16, 2023 · 570e542 · 570e542
1 parent 67c9170
commit 570e542
Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         maintainer_credential_ref = 'dockerhub-tier'
         imagename = 'g'
         tag = 'l'
-        version='4.1.1'
+        version='4.1.2'
     }
     stages {
         stage('Setting build context') {

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

diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md
@@ -53,7 +53,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.1.0
+export COMANAGE_REGISTRY_VERSION=4.1.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION}"
 docker build \

diff --git 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=8.0.27
+ARG PHP_VERSION=8.0.28
 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-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile
@@ -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=230202
+ENV TIER_RELEASE=230315
 ENV TIER_MAINTAINER=tier
 
 WORKDIR /srv/comanage-registry

diff --git a/comanage-registry-internet2-tier/README.md b/comanage-registry-internet2-tier/README.md
@@ -58,7 +58,7 @@ docker build \
 ## Building Example
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.1.0
+export COMANAGE_REGISTRY_VERSION=4.1.2
 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1
 export COMANAGE_REGISTRY_I2_IMAGE_VERSION=1
@@ -134,7 +134,7 @@ docker run -d \
   -v /etc/shibboleth/my-org-metadata.xml:/etc/shibboleth/my-org-metadata.xml \
   -p 80:80 \
   -p 443:443 \
-  comanage-registry:4.1.0-internet2-tier-1
+  comanage-registry:4.1.2-internet2-tier-1
 ```
 
 ## Logging

diff --git a/common.bash b/common.bash
@@ -1,3 +1,3 @@
 maintainer="i2incommon"
 imagename="comanage-registry"
-COMANAGE_REGISTRY_VERSION="4.1.1"
+COMANAGE_REGISTRY_VERSION="4.1.2"
diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md
@@ -50,7 +50,7 @@ wiki page for the list of releases. We recommend using the latest release.
 Here is an example (but please check the wiki page for the latest release number):
 
 ```
-export COMANAGE_REGISTRY_VERSION=4.0.2
+export COMANAGE_REGISTRY_VERSION=4.1.2
 ```
 
 * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
@@ -110,7 +110,7 @@ popd
 
 ## Running the InCommon TAP image
 
-* Install Docker. These instructions require version 17.05 or higher.
+* Install Docker. 
 
 * Initialize the Docker Swarm:
 
@@ -190,12 +190,12 @@ If you are using a pre-built InCommon TAP image change the `image` below for
 the comanage-registry service to be the name of the TAP image you are using:
 
 ```
-version: '3.1'
+version: '3.8'
 
 services:
 
     comanage-registry-database:
-        image: mariadb:10.2
+        image: mariadb:10.4.28
         volumes:
             - /srv/docker/var/lib/mysql:/var/lib/mysql
         environment: