From 2f21221a60269533b39cdaab2689c4b427dda26c Mon Sep 17 00:00:00 2001 From: iromli Date: Sat, 21 Dec 2024 05:25:19 +0700 Subject: [PATCH] chore(cloud-native): update assets and dependencies of OCI images Signed-off-by: iromli --- docker-jans-all-in-one/Dockerfile | 2 +- docker-jans-auth-server/Dockerfile | 21 ++++++--------------- docker-jans-casa/Dockerfile | 4 ++-- docker-jans-certmanager/Dockerfile | 4 ++-- docker-jans-config-api/Dockerfile | 4 ++-- docker-jans-configurator/Dockerfile | 4 ++-- docker-jans-fido2/Dockerfile | 4 ++-- docker-jans-kc-scheduler/Dockerfile | 4 ++-- docker-jans-keycloak-link/Dockerfile | 4 ++-- docker-jans-link/Dockerfile | 4 ++-- docker-jans-monolith/Dockerfile | 2 +- docker-jans-persistence-loader/Dockerfile | 2 +- docker-jans-saml/Dockerfile | 4 ++-- docker-jans-scim/Dockerfile | 4 ++-- 14 files changed, 29 insertions(+), 38 deletions(-) diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile index 4b830f9dcb1..58b1fb3f7db 100644 --- a/docker-jans-all-in-one/Dockerfile +++ b/docker-jans-all-in-one/Dockerfile @@ -58,7 +58,7 @@ RUN apk update \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=99285e94fcc81dd6a391e09d13901050883becd2 +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 # 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 assets diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile index 078bfd0e84f..066ea36e459 100644 --- a/docker-jans-auth-server/Dockerfile +++ b/docker-jans-auth-server/Dockerfile @@ -51,7 +51,7 @@ RUN /opt/jython/bin/pip uninstall -y pip setuptools # =========== ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-12-08 20:08' +ENV CN_BUILD_DATE='2024-12-20 08:35' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war @@ -75,22 +75,13 @@ RUN mkdir -p /usr/share/java \ ARG TWILIO_VERSION=7.17.0 ARG JSMPP_VERSION=2.3.7 -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} -ARG AGAMA_INBOUND_VERSION=${CN_VERSION} -ARG AGAMA_INBOUND_BUILD_DATE=${CN_BUILD_DATE} -ARG JANS_LOCK_VERSION=${CN_VERSION} -ARG JANS_LOCK_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/ \ - && wget -q https://jenkins.jans.io/maven/io/jans/casa-config/${CASA_CONFIG_VERSION}/casa-config-${CASA_CONFIG_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs \ - && wget -q https://jenkins.jans.io/maven/io/jans/jans-fido2-client/${FIDO2_CLIENT_VERSION}/jans-fido2-client-${FIDO2_CLIENT_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs \ - && wget -q https://jenkins.jans.io/maven/io/jans/agama-inbound/${AGAMA_INBOUND_VERSION}/agama-inbound-${AGAMA_INBOUND_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs \ - && wget -q https://jenkins.jans.io/maven/io/jans/jans-lock-service/${JANS_LOCK_VERSION}/jans-lock-service-${JANS_LOCK_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs \ - && wget -q https://jenkins.jans.io/maven/io/jans/jans-lock-model/${JANS_LOCK_VERSION}/jans-lock-model-${JANS_LOCK_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs + && for custom_lib in casa-config jans-fido2-client jans-fido2-model agama-inbound jans-lock-service jans-lock-model; \ + do \ + wget -nv "https://jenkins.jans.io/maven/io/jans/${custom_lib}/${CN_VERSION}/${custom_lib}-${CN_VERSION}.jar" -P "${JETTY_BASE}/jans-auth/_libs"; \ + done # =========== # Assets sync @@ -103,7 +94,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \ /app/static/rdbm \ /app/schema -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-casa/Dockerfile b/docker-jans-casa/Dockerfile index 84b976afbaf..15069eda1be 100644 --- a/docker-jans-casa/Dockerfile +++ b/docker-jans-casa/Dockerfile @@ -30,7 +30,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_ # ==== ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-10-27 08:51' +ENV CN_BUILD_DATE='2024-12-20 09:16' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/casa/${CN_VERSION}/casa-${CN_VERSION}.war @@ -60,7 +60,7 @@ RUN mkdir -p /usr/share/java \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile index f8576ab7e7c..ba90e09e1bf 100644 --- a/docker-jans-certmanager/Dockerfile +++ b/docker-jans-certmanager/Dockerfile @@ -15,7 +15,7 @@ RUN apk update \ # JAR files required to generate OpenID Connect keys ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 08:44' +ENV CN_BUILD_DATE='2024-12-20 08:29' 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 @@ -25,7 +25,7 @@ RUN wget -q ${CN_SOURCE_URL} -P /app/javalibs/ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 # 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 assets diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile index 847834d0416..e0428b87354 100644 --- a/docker-jans-config-api/Dockerfile +++ b/docker-jans-config-api/Dockerfile @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO # ========== ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 09:19' +ENV CN_BUILD_DATE='2024-12-20 09:07' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war @@ -70,7 +70,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-config-api/_plugins \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile index 00608f25587..c29dec1860a 100644 --- a/docker-jans-configurator/Dockerfile +++ b/docker-jans-configurator/Dockerfile @@ -16,7 +16,7 @@ RUN apk update \ # JAR files required to generate OpenID Connect keys ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 08:44' +ENV CN_BUILD_DATE='2024-12-20 08:29' 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 @@ -27,7 +27,7 @@ RUN mkdir -p /opt/jans/configurator/javalibs \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile index 4b23948ed4a..4ecc4b2429a 100644 --- a/docker-jans-fido2/Dockerfile +++ b/docker-jans-fido2/Dockerfile @@ -42,7 +42,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-12-15 10:17' +ENV CN_BUILD_DATE='2024-12-20 11:02' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war @@ -61,7 +61,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-fido2/webapps \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=c9abc7f8ee7e45c170b7b2c832cf35b3c6d28bd6 +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-kc-scheduler/Dockerfile b/docker-jans-kc-scheduler/Dockerfile index 872b5041101..e4fa6cfd1fe 100644 --- a/docker-jans-kc-scheduler/Dockerfile +++ b/docker-jans-kc-scheduler/Dockerfile @@ -14,7 +14,7 @@ RUN apk update \ # ============ ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-10-27 08:54' +ENV CN_BUILD_DATE='2024-12-20 09:15' ENV SCHEDULER_HOME=/opt/kc-scheduler RUN mkdir -p ${SCHEDULER_HOME}/bin \ @@ -38,7 +38,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/codehaus/janino/janino/3.1.9/jani # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 # 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 assets diff --git a/docker-jans-keycloak-link/Dockerfile b/docker-jans-keycloak-link/Dockerfile index b8a1a5924c3..92bb349c513 100644 --- a/docker-jans-keycloak-link/Dockerfile +++ b/docker-jans-keycloak-link/Dockerfile @@ -42,7 +42,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 09:17' +ENV CN_BUILD_DATE='2024-12-20 09:05' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-keycloak-link-server/${CN_VERSION}/jans-keycloak-link-server-${CN_VERSION}.war @@ -61,7 +61,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-keycloak-link/webapps \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-link/Dockerfile b/docker-jans-link/Dockerfile index e637a127d73..0dca6e5ae71 100644 --- a/docker-jans-link/Dockerfile +++ b/docker-jans-link/Dockerfile @@ -42,7 +42,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 09:08' +ENV CN_BUILD_DATE='2024-12-20 08:56' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-link-server/${CN_VERSION}/jans-link-server-${CN_VERSION}.war @@ -61,7 +61,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-link/webapps \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-monolith/Dockerfile b/docker-jans-monolith/Dockerfile index e768136cfde..cb386e1d743 100644 --- a/docker-jans-monolith/Dockerfile +++ b/docker-jans-monolith/Dockerfile @@ -42,7 +42,7 @@ EXPOSE 443 8080 1636 # jans-linux-setup # ===================== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 # cleanup RUN rm -rf /tmp/jans diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile index d3eb1833bec..93c896fbf17 100644 --- a/docker-jans-persistence-loader/Dockerfile +++ b/docker-jans-persistence-loader/Dockerfile @@ -16,7 +16,7 @@ RUN apk update \ # =========== # janssenproject/jans SHA commit -ENV JANS_SOURCE_VERSION=99285e94fcc81dd6a391e09d13901050883becd2 +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 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 diff --git a/docker-jans-saml/Dockerfile b/docker-jans-saml/Dockerfile index bf427e8f51d..68bcec36d33 100644 --- a/docker-jans-saml/Dockerfile +++ b/docker-jans-saml/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir -p /opt/keycloak/logs \ # ============== ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-10-27 08:54' +ENV CN_BUILD_DATE='2024-12-20 09:15' RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-spi/${CN_VERSION}/kc-jans-spi-${CN_VERSION}.jar -P /opt/keycloak/providers \ && wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-spi/${CN_VERSION}/kc-jans-spi-${CN_VERSION}-deps.zip -O /tmp/kc-jans-spi.zip \ @@ -35,7 +35,7 @@ RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-spi/${CN_VERSION}/kc-j # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # note that as we're pulling from a monorepo (with multiple project in it) diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile index bd9666e1767..c1b15517793 100644 --- a/docker-jans-scim/Dockerfile +++ b/docker-jans-scim/Dockerfile @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO # ==== ENV CN_VERSION=0.0.0-nightly -ENV CN_BUILD_DATE='2024-11-15 09:15' +ENV CN_BUILD_DATE='2024-12-20 10:33' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war @@ -60,7 +60,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-scim/webapps \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=39e74a153edf01db8ab43be81f5585bc4210818d +ENV JANS_SOURCE_VERSION=b0a7da353d4ef298e5216ed75148da66b2d6b411 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources