Skip to content

4.4.1 #11

Merged
merged 3 commits into from Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-base/README.md
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-cron/README.md
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions comanage-registry-internet2-tier/README.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions comanage-registry-mod-auth-openidc/Dockerfile
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common.bash
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="comanage-registry"
COMANAGE_REGISTRY_VERSION="4.4.0"
COMANAGE_REGISTRY_VERSION="4.4.1"
2 changes: 1 addition & 1 deletion docs/comanage-registry-internet2-tier.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/evaluation.md
Expand Up @@ -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:
Expand Down