diff --git a/Jenkinsfile b/Jenkinsfile index 5bc7108..b7a56ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { maintainer_credential_ref = 'dockerhub-tier' imagename = 'g' tag = 'l' - version='4.4.0' + version='4.4.1' } stages { stage('Setting build context') { diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md index d45c089..bb7c72c 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 +export COMANAGE_REGISTRY_VERSION=4.4.1 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 b1ec573..1c11e37 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 +export COMANAGE_REGISTRY_VERSION=4.4.1 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 06f8fe3..fcf5c3c 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 +export COMANAGE_REGISTRY_VERSION=4.4.1 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-internet2-tier-1 + comanage-registry:4.4.1-internet2-tier-1 ``` ## Logging diff --git a/comanage-registry-mod-auth-openidc/Dockerfile b/comanage-registry-mod-auth-openidc/Dockerfile index e615615..f633e15 100644 --- a/comanage-registry-mod-auth-openidc/Dockerfile +++ b/comanage-registry-mod-auth-openidc/Dockerfile @@ -18,14 +18,14 @@ # limitations under the License. ARG COMANAGE_REGISTRY_VERSION=develop ARG COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 -ARG MOD_AUTH_OPENIDC_SRC_URL=https://github.com/zmartzone/mod_auth_openidc/releases/download/v2.3.11/mod_auth_openidc-2.3.11.tar.gz +ARG MOD_AUTH_OPENIDC_VERSION FROM comanage-registry-base:${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION} AS comanage -FROM debian:bullseye AS building +FROM debian:bookworm-slim AS building -ARG MOD_AUTH_OPENIDC_SRC_URL -ENV MOD_AUTH_OPENIDC_SRC_URL ${MOD_AUTH_OPENIDC_SRC_URL} +ARG MOD_AUTH_OPENIDC_VERSION +ENV MOD_AUTH_OPENIDC_VERSION ${MOD_AUTH_OPENIDC_VERSION:-2.4.16.6} RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -40,12 +40,13 @@ RUN apt-get update \ libpcre3-dev \ libssl-dev \ pkg-config \ - wget \ + wget + +RUN MOD_AUTH_OPENIDC_URL="https://github.com/zmartzone/mod_auth_openidc/releases/download/v${MOD_AUTH_OPENIDC_VERSION}/mod_auth_openidc-${MOD_AUTH_OPENIDC_VERSION}.tar.gz" \ && mkdir -p /tmp/mod_auth_openidc \ - && wget -O mod_auth_openidc.tar.gz "$MOD_AUTH_OPENIDC_SRC_URL" \ + && wget -O mod_auth_openidc.tar.gz "${MOD_AUTH_OPENIDC_URL}" \ && tar -zxf mod_auth_openidc.tar.gz -C /tmp/mod_auth_openidc --strip-components=1 \ && cd /tmp/mod_auth_openidc \ - && ./autogen.sh \ && ./configure --with-apxs2=`which apxs2` \ && make \ && make install diff --git a/common.bash b/common.bash index 8ec8c41..48fe1e4 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" imagename="comanage-registry" -COMANAGE_REGISTRY_VERSION="4.4.0" +COMANAGE_REGISTRY_VERSION="4.4.1" diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md index 4898c5e..89fe0ac 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 +export COMANAGE_REGISTRY_VERSION=4.4.1 ``` * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the diff --git a/docs/evaluation.md b/docs/evaluation.md index b7ed895..ca8c70c 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 +export COMANAGE_REGISTRY_VERSION=4.4.1 ``` * Build the base COmanage Registry image: