Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docker-jans): upgrade base image to Java 17 #6231

Merged
merged 1 commit into from
Oct 11, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docker-jans-auth-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjdk-alpine:11.0.16
FROM bellsoft/liberica-openjdk-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -51,7 +51,7 @@ RUN /opt/jython/bin/pip uninstall -y pip setuptools
# ===========

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-10-05 08:23'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war

# Install Jans Auth
Expand All @@ -74,10 +74,10 @@ RUN mkdir -p /usr/share/java \

ARG TWILIO_VERSION=7.17.0
ARG JSMPP_VERSION=2.3.7
ARG CASA_CONFIG_VERSION=1.0.19-SNAPSHOT
ARG CASA_CONFIG_BUILD_DATE="2023-02-13 11:44"
ARG FIDO2_CLIENT_VERSION=1.0.19-SNAPSHOT
ARG FIDO2_CLIENT_BUILD_DATE="2023-01-31 15:04"
ARG CASA_CONFIG_VERSION=${CN_VERSION}
ARG CASA_CONFIG_BUILD_DATE=${CN_BUILD_DATE}
ARG FIDO2_CLIENT_VERSION=${CN_VERSION}
ARG FIDO2_CLIENT_BUILD_DATE=${CN_BUILD_DATE}

RUN wget -q https://repo1.maven.org/maven2/com/twilio/sdk/twilio/${TWILIO_VERSION}/twilio-${TWILIO_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs/ \
&& wget -q https://repo1.maven.org/maven2/org/jsmpp/jsmpp/${JSMPP_VERSION}/jsmpp-${JSMPP_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs/ \
Expand All @@ -92,7 +92,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \
${JETTY_BASE}/jans-auth/agama/ftl \
${JETTY_BASE}/jans-auth/agama/scripts

ENV JANS_SOURCE_VERSION=eb4e84a3b7fbf9a3ad778b3cc77b40dec3210e5d
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770

# note that as we're pulling from a monorepo (with multiple project in it)
# we are using partial-clone and sparse-checkout to get the agama code
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
6 changes: 3 additions & 3 deletions docker-jans-casa/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -30,7 +30,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_
# ====

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-10-05 08:38'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/casa/${CN_VERSION}/casa-${CN_VERSION}.war

# Install Casa
Expand All @@ -55,7 +55,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-casa/plugins \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=eb4e84a3b7fbf9a3ad778b3cc77b40dec3210e5d
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_CASA_EXTRAS_DIR=jans-casa/extras

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
webdavclient3>=3.14.5
libcst<0.4
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
4 changes: 2 additions & 2 deletions docker-jans-certmanager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand All @@ -15,7 +15,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:15'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN wget -q ${CN_SOURCE_URL} -P /app/javalibs/
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-certmanager/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
click==6.7
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
16 changes: 8 additions & 8 deletions docker-jans-config-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
# ==========

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:26'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war

# Install Jans Config API
Expand Down Expand Up @@ -70,15 +70,15 @@ RUN wget -q https://github.com/GluuFederation/gluu-snap/raw/${PYFACTER_VERSION}/
RUN mkdir -p /usr/share/java \
${JETTY_BASE}/jans-config-api/_plugins

ENV SCIM_PLUGIN_BUILD_DATE='2023-09-23 10:28'
ENV SCIM_PLUGIN_BUILD_DATE=${CN_BUILD_DATE}
ENV SCIM_PLUGIN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api/plugins/scim-plugin/${CN_VERSION}/scim-plugin-${CN_VERSION}-distribution.jar
ENV ADMIN_UI_PLUGIN_BUILD_DATE='2023-09-23 10:27'
ENV ADMIN_UI_PLUGIN_BUILD_DATE=${CN_BUILD_DATE}
ENV ADMIN_UI_PLUGIN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api/plugins/admin-ui-plugin/${CN_VERSION}/admin-ui-plugin-${CN_VERSION}-distribution.jar
ENV FIDO2_PLUGIN_BUILD_DATE='2023-09-23 10:29'
ENV FIDO2_PLUGIN_BUILD_DATE=${CN_BUILD_DATE}
ENV FIDO2_PLUGIN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api/plugins/fido2-plugin/${CN_VERSION}/fido2-plugin-${CN_VERSION}-distribution.jar
ENV USER_MGT_PLUGIN_BUILD_DATE='2023-09-23 10:28'
ENV USER_MGT_PLUGIN_BUILD_DATE=${CN_BUILD_DATE}
ENV USER_MGT_PLUGIN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api/plugins/user-mgt-plugin/${CN_VERSION}/user-mgt-plugin-${CN_VERSION}-distribution.jar
ENV JANS_LINK_PLUGIN_BUILD_DATE='2023-09-11 16:58'
ENV JANS_LINK_PLUGIN_BUILD_DATE=${CN_BUILD_DATE}
ENV JANS_LINK_PLUGIN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api/plugins/jans-link-plugin/${CN_VERSION}/jans-link-plugin-${CN_VERSION}-distribution.jar

RUN wget -q ${SCIM_PLUGIN_SOURCE_URL} -O ${JETTY_BASE}/jans-config-api/_plugins/scim-plugin.jar \
Expand All @@ -91,7 +91,7 @@ RUN wget -q ${SCIM_PLUGIN_SOURCE_URL} -O ${JETTY_BASE}/jans-config-api/_plugins/
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=14a4ee5d21b788db7bb3e9bb94a1d1caf228f95a
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
4 changes: 2 additions & 2 deletions docker-jans-configurator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand All @@ -15,7 +15,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:15'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN mkdir -p /opt/jans/configurator/javalibs \
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-configurator/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
click==6.7
marshmallow==3.10.0
fqdn==1.4.0
Expand Down
6 changes: 3 additions & 3 deletions docker-jans-fido2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
# =====

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:21'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war

# Install FIDO2
Expand All @@ -59,7 +59,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-fido2/webapps \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=14a4ee5d21b788db7bb3e9bb94a1d1caf228f95a
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
6 changes: 3 additions & 3 deletions docker-jans-link/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
# ====

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:19'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-link-server/${CN_VERSION}/jans-link-server-${CN_VERSION}.war

# Install Link
Expand All @@ -59,7 +59,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-link/webapps \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=14a4ee5d21b788db7bb3e9bb94a1d1caf228f95a
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
4 changes: 2 additions & 2 deletions docker-jans-persistence-loader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -26,7 +26,7 @@ RUN python3 -m ensurepip \
# =====================

# janssenproject/jans SHA commit
ENV JANS_SOURCE_VERSION=14a4ee5d21b788db7bb3e9bb94a1d1caf228f95a
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCRIPT_CATALOG_DIR=docs/script-catalog
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-persistence-loader/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
20 changes: 14 additions & 6 deletions docker-jans-persistence-loader/scripts/upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -843,17 +843,25 @@ def _transform_auth_errors_config(conf):
})
should_update = True

if "invalid_ssa_metadata" not in ssa_errors:
conf["ssa"].append({
"id": "invalid_ssa_metadata",
"description": "The value of one of the SSA Metadata fields is invalid and the server has rejected this request. Note that an Authorization Server MAY choose to substitute a valid value for any requested parameter of a SSA's Metadata.",
"uri": None,
})
should_update = True

# dpop as part of token errors
dpop_errors = [
{
"id":"use_dpop_nonce",
"description":"Authorization server requires nonce in DPoP proof.",
"uri": None
"id": "use_dpop_nonce",
"description": "Authorization server requires nonce in DPoP proof.",
"uri": None
},
{
"id":"use_new_dpop_nonce",
"description":"Authorization server requires new nonce in DPoP proof.",
"uri": None
"id": "use_new_dpop_nonce",
"description": "Authorization server requires new nonce in DPoP proof.",
"uri": None
},
]
token_err_ids = [err["id"] for err in conf["token"]]
Expand Down
6 changes: 3 additions & 3 deletions docker-jans-scim/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bellsoft/liberica-openjre-alpine:11.0.16
FROM bellsoft/liberica-openjre-alpine:17.0.8

# ===============
# Alpine packages
Expand Down Expand Up @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
# ====

ENV CN_VERSION=1.0.19-SNAPSHOT
ENV CN_BUILD_DATE='2023-09-23 10:24'
ENV CN_BUILD_DATE='2023-10-10 08:38'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war

# Install SCIM
Expand All @@ -59,7 +59,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-scim/webapps \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=14a4ee5d21b788db7bb3e9bb94a1d1caf228f95a
ENV JANS_SOURCE_VERSION=6f3b84f8ffe529855a28288e1a3e37d9fb2ba770
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pinned to py3-grpcio version to avoid failure on native extension build
grpcio==1.41.0
grpcio==1.54.2
libcst<0.4
ruamel.yaml==0.16.10
git+https://github.com/JanssenProject/jans@36cd1798afaa3c1c05246a4a338804d20713cf9f#egg=jans-pycloudlib&subdirectory=jans-pycloudlib