From 0dadff5b959214146d330318c16e353f83aeaede Mon Sep 17 00:00:00 2001 From: iromli Date: Sat, 8 Jun 2024 03:26:04 +0700 Subject: [PATCH] chore(cloud-native): sync assets to OCI images Signed-off-by: iromli --- docker-jans-all-in-one/Dockerfile | 2 +- docker-jans-auth-server/Dockerfile | 4 ++-- docker-jans-auth-server/scripts/upgrade.py | 6 ++++-- docker-jans-casa/Dockerfile | 4 ++-- docker-jans-certmanager/Dockerfile | 4 ++-- docker-jans-config-api/Dockerfile | 4 ++-- docker-jans-config-api/scripts/upgrade.py | 17 ++++++++++++++++- 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 | 5 ++--- 16 files changed, 45 insertions(+), 29 deletions(-) diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile index 1a8ef036b26..bfe02dc6941 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a # 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 a9257b92c6c..f46b34f03c3 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:39' +ENV CN_BUILD_DATE='2024-06-07 15:39' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war @@ -103,7 +103,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \ /app/static/rdbm \ /app/schema -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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-auth-server/scripts/upgrade.py b/docker-jans-auth-server/scripts/upgrade.py index 392c99315e4..1b73568b32e 100644 --- a/docker-jans-auth-server/scripts/upgrade.py +++ b/docker-jans-auth-server/scripts/upgrade.py @@ -23,7 +23,7 @@ Entry = namedtuple("Entry", ["id", "attrs"]) -def _transform_lock_dynamic_config(conf): +def _transform_lock_dynamic_config(conf, manager): should_update = False opa_url = os.environ.get("CN_OPA_URL", "http://localhost:8181/v1") @@ -33,11 +33,13 @@ def _transform_lock_dynamic_config(conf): should_update = True # add missing top-level keys + hostname = manager.config.get("hostname") for missing_key, value in [ ("policiesJsonUrisAuthorizationToken", conf.pop("policiesJsonUrisAccessToken", "")), ("policiesZipUris", []), ("policiesZipUrisAuthorizationToken", conf.pop("policiesZipUrisAccessToken", "")), ("pdpType", "OPA"), + ("baseEndpoint", f"https://{hostname}/jans-lock/v1"), ]: if missing_key not in conf: conf[missing_key] = value @@ -241,7 +243,7 @@ def update_lock_dynamic_config(self): with contextlib.suppress(json.decoder.JSONDecodeError): entry.attrs["jansConfDyn"] = json.loads(entry.attrs["jansConfDyn"]) - conf, should_update = _transform_lock_dynamic_config(entry.attrs["jansConfDyn"]) + conf, should_update = _transform_lock_dynamic_config(entry.attrs["jansConfDyn"], self.manager) if should_update: if self.backend.type != "couchbase": diff --git a/docker-jans-casa/Dockerfile b/docker-jans-casa/Dockerfile index 77b41cd1f30..48558687dfe 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 12:00' +ENV CN_BUILD_DATE='2024-06-07 16:01' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/casa/${CN_VERSION}/casa-${CN_VERSION}.war @@ -56,7 +56,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-casa/plugins \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup ARG JANS_CASA_EXTRAS_DIR=jans-casa/extras diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile index e0b0435273b..0e0b624a765 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:37' +ENV CN_BUILD_DATE='2024-06-07 15:36' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a # 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 4a17ee66f50..2bda675a9fe 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:53' +ENV CN_BUILD_DATE='2024-06-07 15:53' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war @@ -78,7 +78,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-config-api/_plugins \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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-config-api/scripts/upgrade.py b/docker-jans-config-api/scripts/upgrade.py index 23533fc5df4..3a0b5935b4c 100644 --- a/docker-jans-config-api/scripts/upgrade.py +++ b/docker-jans-config-api/scripts/upgrade.py @@ -59,6 +59,7 @@ def _transform_api_dynamic_config(conf): ("disableLoggerTimer", False), ("disableAuditLogger", False), ("assetMgtConfiguration", {}), + ("maxCount", 200), ]: if missing_key not in conf: conf[missing_key] = value @@ -160,13 +161,27 @@ def _transform_api_dynamic_config(conf): ], "fileExtensionValidationEnabled": True, "moduleNameValidationEnabled": True, - "jansModules": ["jans-auth", "jans-casa", "jans-config-api", "jans-fido2", "jans-link", "jans-lock", "jans-scim"], + "jansServiceModule": conf["assetMgtConfiguration"].pop("jansModules", []), } for k, v in asset_attrs.items(): if k not in conf["assetMgtConfiguration"]: conf["assetMgtConfiguration"][k] = v should_update = True + for module in [ + "jans-auth", + "jans-casa", + "jans-config-api", + "jans-fido2", + "jans-link", + "jans-lock", + "jans-scim", + "jans-keycloak-link", + ]: + if module not in conf["assetMgtConfiguration"]["jansServiceModule"]: + conf["assetMgtConfiguration"]["jansServiceModule"].append(module) + should_update = True + # finalized conf and flag to determine update process return conf, should_update diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile index 0dbd478f152..caf5f77d237 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:37' +ENV CN_BUILD_DATE='2024-06-07 15:36' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 275ac04468b..5219a80da93 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:45' +ENV CN_BUILD_DATE='2024-06-07 15:45' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 c6db84dc136..33452bae68d 100644 --- a/docker-jans-kc-scheduler/Dockerfile +++ b/docker-jans-kc-scheduler/Dockerfile @@ -14,7 +14,7 @@ RUN apk update \ # ============ ENV CN_VERSION=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-07 13:32' +ENV CN_BUILD_DATE='2024-06-07 16:00' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a # 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 af860de80e7..9a74d431051 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:50' +ENV CN_BUILD_DATE='2024-06-07 15:51' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 814a0535fda..f1f2a4188b6 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=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:43' +ENV CN_BUILD_DATE='2024-06-07 15:42' 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 02461b6e2ff..cffcaa6ed07 100644 --- a/docker-jans-monolith/Dockerfile +++ b/docker-jans-monolith/Dockerfile @@ -38,7 +38,7 @@ EXPOSE 443 8080 1636 # jans-linux-setup # ===================== -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a # cleanup RUN rm -rf /tmp/jans diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile index b612e4576c3..fd64fab8eb6 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=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 096d7027311..a99502c3dc2 100644 --- a/docker-jans-saml/Dockerfile +++ b/docker-jans-saml/Dockerfile @@ -24,7 +24,7 @@ RUN mkdir -p /opt/keycloak/logs \ # ============== ENV CN_VERSION=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-25 08:51' +ENV CN_BUILD_DATE='2024-06-07 16:00' RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-storage-plugin/${CN_VERSION}/kc-jans-storage-plugin-${CN_VERSION}.jar -P /opt/keycloak/providers \ && wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-storage-plugin/${CN_VERSION}/kc-jans-storage-plugin-${CN_VERSION}-deps.zip -O /tmp/kc-storage-deps.zip \ @@ -40,7 +40,7 @@ RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-authn-plugin/${CN_VERS # Assets sync # =========== -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a 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 4a900a701c9..ab1684d14c9 100644 --- a/docker-jans-scim/Dockerfile +++ b/docker-jans-scim/Dockerfile @@ -40,9 +40,8 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO # SCIM # ==== - ENV CN_VERSION=1.1.3-SNAPSHOT -ENV CN_BUILD_DATE='2024-05-29 11:49' +ENV CN_BUILD_DATE='2024-06-07 15:49' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war @@ -61,7 +60,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-scim/webapps \ # Assets sync # =========== -ENV JANS_SOURCE_VERSION=02b462b9c72a27a00646c09f9995eee1a75c7ad7 +ENV JANS_SOURCE_VERSION=a24c0b95a3ee892bccc1882e4f328bab5f35645a ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources