diff --git a/Jenkinsfile b/Jenkinsfile index 64bcbcc..6898510 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { maintainer_credential_ref = 'dockerhub-tier' imagename = 'g' tag = 'l' - version='4.3.2' + version='4.3.3' } stages { stage('Setting build context') { diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile index 3fbe106..013d8b7 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:8.1.26-apache-bullseye +FROM php:8.1.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 index fecccdb..4d19d30 100644 --- 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.3.2 +export COMANAGE_REGISTRY_VERSION=4.3.3 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION}" docker build \ diff --git a/comanage-registry-base/apache-include-directory-registry b/comanage-registry-base/apache-include-directory-registry index b76eee4..20be521 100644 --- a/comanage-registry-base/apache-include-directory-registry +++ b/comanage-registry-base/apache-include-directory-registry @@ -1,5 +1,5 @@ <Directory /var/www/html/registry> -Options Indexes FollowSymLinks +Options -Indexes +FollowSymLinks DirectoryIndex index.php AllowOverride All Require all granted diff --git a/comanage-registry-cron/README.md b/comanage-registry-cron/README.md index fb9132f..0e52390 100644 --- a/comanage-registry-cron/README.md +++ b/comanage-registry-cron/README.md @@ -52,7 +52,7 @@ docker build \ ## Building Example ``` -export COMANAGE_REGISTRY_VERSION=4.3.2 +export COMANAGE_REGISTRY_VERSION=4.3.3 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 export COMANAGE_REGISTRY_CRON_IMAGE_VERSION=1 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_CRON_IMAGE_VERSION}" diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile index d2ef934..a677ca1 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=8.1.26 +ARG PHP_VERSION=8.1.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 index 441bda9..1a8aa76 100644 --- 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=231211 +ENV TIER_RELEASE=240425 ENV TIER_MAINTAINER=tier WORKDIR /srv/comanage-registry diff --git a/comanage-registry-internet2-tier/README.md b/comanage-registry-internet2-tier/README.md index fdd79a4..217c9a2 100644 --- 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.3.2 +export COMANAGE_REGISTRY_VERSION=4.3.3 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.3.2-internet2-tier-1 + comanage-registry:4.3.3-internet2-tier-1 ``` ## Logging diff --git a/common.bash b/common.bash index 45fcd99..fce4e4e 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" imagename="comanage-registry" -COMANAGE_REGISTRY_VERSION="4.3.2" +COMANAGE_REGISTRY_VERSION="4.3.3" diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md index 3873901..14a5faa 100644 --- 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.3.2 +export COMANAGE_REGISTRY_VERSION=4.3.3 ``` * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the diff --git a/docs/evaluation.md b/docs/evaluation.md index 91466ad..120485d 100644 --- a/docs/evaluation.md +++ b/docs/evaluation.md @@ -44,7 +44,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.3.2 +export COMANAGE_REGISTRY_VERSION=4.3.3 ``` * Build the base COmanage Registry image: