From 3dd56c9d819434cc251e7ce74a620af5c4f1e119 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Thu, 10 Oct 2024 09:37:03 +0300
Subject: [PATCH 1/3] bump version to 4.4.0-rc1
---
Jenkinsfile | 4 ++--
comanage-registry-base/Dockerfile | 2 +-
comanage-registry-base/README.md | 2 +-
comanage-registry-cron/README.md | 2 +-
comanage-registry-internet2-tier/README.md | 4 ++--
common.bash | 2 +-
docs/comanage-registry-internet2-tier.md | 2 +-
docs/evaluation.md | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
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:
From 790e1037a646152b39104ea56a17075326e8ddc3 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Thu, 10 Oct 2024 09:42:39 +0300
Subject: [PATCH 2/3] fix libldap dependency for bookworm
---
comanage-registry-base/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/comanage-registry-base/Dockerfile b/comanage-registry-base/Dockerfile
index 2468623..a1240f4 100644
--- a/comanage-registry-base/Dockerfile
+++ b/comanage-registry-base/Dockerfile
@@ -26,7 +26,7 @@ FROM php:8.2.24-apache-bookworm
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
- libldap-2.4-2 \
+ libldap-2.5-0 \
libldap2-dev \
libmariadb-dev \
libpq-dev \
From 805ac62a84d1af2fb979e76a831b3c09e6c3a1c4 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Wed, 23 Oct 2024 11:56:02 +0300
Subject: [PATCH 3/3] 4.4.0-rc2 version
---
Jenkinsfile | 6 +++---
comanage-registry-base/README.md | 2 +-
comanage-registry-cron/README.md | 2 +-
comanage-registry-internet2-tier/README.md | 4 ++--
common.bash | 2 +-
docs/comanage-registry-internet2-tier.md | 2 +-
docs/evaluation.md | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4bc2298..032c120 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
maintainer_credential_ref = 'dockerhub-tier'
imagename = 'g'
tag = 'l'
- version='4.4.0-rc1'
+ version='4.4.0-rc2'
}
stages {
stage('Setting build context') {
@@ -45,7 +45,7 @@ pipeline {
image_dir = 'comanage-registry-internet2-tier-base'
build_arg = '--no-cache ' +
"-f ./$image_dir/Dockerfile ./$image_dir"
- def tap_base_image = docker.build("$image_to_build", "$build_arg")
+// def tap_base_image = docker.build("$image_to_build", "$build_arg")
image_to_build = "$maintainer/$imagename"
image_dir = 'comanage-registry-internet2-tier'
@@ -54,7 +54,7 @@ pipeline {
"--build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 " +
"--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")
+// def tap_image = docker.build("$image_to_build", "$build_arg")
// tap_image.push("$tag")
image_to_build = "$maintainer/$imagename-cron"
diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md
index 3b6ab64..f9cd195 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.4.0-rc1
+export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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 ed6e2ba..df34333 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.4.0-rc1
+export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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 44e57b2..f4ddbbc 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.4.0-rc1
+export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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.4.0-rc1-internet2-tier-1
+ comanage-registry:4.4.0-rc2-internet2-tier-1
```
## Logging
diff --git a/common.bash b/common.bash
index 9770e8c..b728831 100644
--- a/common.bash
+++ b/common.bash
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="comanage-registry"
-COMANAGE_REGISTRY_VERSION="4.4.0-rc1"
+COMANAGE_REGISTRY_VERSION="4.4.0-rc2"
diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md
index d943c27..6c19bb3 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.4.0-rc1
+export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
```
* Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
diff --git a/docs/evaluation.md b/docs/evaluation.md
index 0ae4f99..b96a76e 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.4.0-rc1
+export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
```
* Build the base COmanage Registry image: