diff --git a/Jenkinsfile b/Jenkinsfile index 7906ba3..4bc2298 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { maintainer_credential_ref = 'dockerhub-tier' imagename = 'g' tag = 'l' - version='4.3.5' + version='4.4.0-rc1' } stages { stage('Setting build context') { @@ -55,7 +55,7 @@ pipeline { "--build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 " + "-f ./$image_dir/Dockerfile ./$image_dir" def tap_image = docker.build("$image_to_build", "$build_arg") - tap_image.push("$tag") +// tap_image.push("$tag") image_to_build = "$maintainer/$imagename-cron" image_dir = 'comanage-registry-cron' diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile index d660f81..2468623 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.29-apache-bullseye +FROM php:8.2.24-apache-bookworm # Official PHP image with Apache HTTPD includes # --with-openssl diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md index b8c7e61..3b6ab64 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.5 +export COMANAGE_REGISTRY_VERSION=4.4.0-rc1 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION}" docker build \ diff --git a/comanage-registry-cron/README.md b/comanage-registry-cron/README.md index 7b8f980..ed6e2ba 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.5 +export COMANAGE_REGISTRY_VERSION=4.4.0-rc1 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/README.md b/comanage-registry-internet2-tier/README.md index a0c1df8..44e57b2 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.5 +export COMANAGE_REGISTRY_VERSION=4.4.0-rc1 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.5-internet2-tier-1 + comanage-registry:4.4.0-rc1-internet2-tier-1 ``` ## Logging diff --git a/common.bash b/common.bash index 4669250..9770e8c 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" imagename="comanage-registry" -COMANAGE_REGISTRY_VERSION="4.3.5" +COMANAGE_REGISTRY_VERSION="4.4.0-rc1" diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md index 45e258e..d943c27 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.5 +export COMANAGE_REGISTRY_VERSION=4.4.0-rc1 ``` * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the diff --git a/docs/evaluation.md b/docs/evaluation.md index d990305..0ae4f99 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.5 +export COMANAGE_REGISTRY_VERSION=4.4.0-rc1 ``` * Build the base COmanage Registry image: