build(images): update dependencies to 1.0.1-SNAPSHOT (#1444)

JanssenProject · May 25, 2022 · 7d2f452 · 7d2f452
1 parent 1d4e70d
commit 7d2f452
Show file tree

Hide file tree

Showing 23 changed files with 87 additions and 56 deletions.
diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile
@@ -54,8 +54,8 @@ RUN /opt/jython/bin/pip uninstall -y pip
 # Auth server
 # ===========
 
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:25'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:14'
 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
@@ -218,7 +218,7 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
 LABEL name="janssenproject/auth-server" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen Authorization Server" \
     description="OAuth 2.0 server and client; OpenID Connect Provider (OP) & UMA Authorization Server (AS)"

diff --git a/docker-jans-auth-server/Makefile b/docker-jans-auth-server/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/auth-server
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-auth-server/README.md b/docker-jans-auth-server/README.md
@@ -5,7 +5,7 @@ Docker image packaging for Janssen Authorization Server.
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-auth-server/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/auth-server:1.0.0_dev`.
+For bleeding-edge/unstable version, use `janssenproject/auth-server:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -114,4 +114,3 @@ The following key-value pairs are the defaults:
     "audit_log_level": "INFO"
 }
 ```
-
diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile
@@ -16,8 +16,8 @@ RUN apk update \
 # ===========
 
 # JAR files required to generate OpenID Connect keys
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:25'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:14'
 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/
@@ -138,7 +138,7 @@ ENV CN_WAIT_MAX_TIME=300 \
 LABEL name="janssenproject/certmanager" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen Certmanager" \
     description="Manage certs and crypto keys for Janssen Server"

diff --git a/docker-jans-certmanager/Makefile b/docker-jans-certmanager/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/certmanager
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-certmanager/README.md b/docker-jans-certmanager/README.md
@@ -6,7 +6,7 @@ The container designed to run as one-time command (or Job in kubernetes world).
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-certmanager/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/certmanager:1.0.0_dev`.
+For bleeding-edge/unstable version, use `janssenproject/certmanager:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -210,7 +210,7 @@ docker run \
     -v $PWD/ssl.crt:/etc/certs/jans_https.crt \
     -v $PWD/ssl.key:/etc/certs/jans_https.key \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    janssenproject/certmanager:1.0.0_dev patch web --opts source:from-files
+    janssenproject/certmanager:1.0.1_dev patch web --opts source:from-files
 ```
 
 Kubernetes CronJob example:
@@ -229,7 +229,7 @@ spec:
         spec:
           containers:
             - name: auth-key-rotation
-              image: janssenproject/certmanager:1.0.0_dev
+              image: janssenproject/certmanager:1.0.1_dev
               resources:
                 requests:
                   memory: "300Mi"

diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile
@@ -31,8 +31,8 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_
 # Config API
 # ==========
 
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:27'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:17'
 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

diff --git a/docker-jans-config-api/Makefile b/docker-jans-config-api/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/config-api
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-config-api/README.md b/docker-jans-config-api/README.md
@@ -5,7 +5,7 @@ Docker image packaging for config-api.
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-config-api/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/config-api`.
+For bleeding-edge/unstable version, use `janssenproject/config-api:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -135,4 +135,3 @@ The following key-value pairs are the defaults:
     "admin_ui_audit_log_level": "INFO"
 }
 ```
-
diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile
@@ -16,8 +16,8 @@ RUN apk update \
 # ===========
 
 # JAR files required to generate OpenID Connect keys
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:25'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:14'
 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/
@@ -115,7 +115,7 @@ ENV CN_WAIT_MAX_TIME=300 \
 LABEL name="janssenproject/configurator" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen Configuration Manager" \
     description="Manage config and secret"

diff --git a/docker-jans-configurator/Makefile b/docker-jans-configurator/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/configurator
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-configurator/README.md b/docker-jans-configurator/README.md
@@ -5,7 +5,7 @@ Configuration manager is a special container used to load (generate/restore) and
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-configurator/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/configurator:1.0.0_dev`.
+For bleeding-edge/unstable version, use `janssenproject/configurator:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -99,7 +99,7 @@ The load command can be used either to generate or restore config and secret for
         -v /path/to/host/volume:/app/db \
         -v /path/to/vault_role_id.txt:/etc/certs/vault_role_id \
         -v /path/to/vault_secret_id.txt:/etc/certs/vault_secret_id \
-        janssenproject/configurator:1.0.0_dev load
+        janssenproject/configurator:1.0.1_dev load
     ```
 
 #### Kubernetes
@@ -147,7 +147,7 @@ The load command can be used either to generate or restore config and secret for
 	            name: config-generate-params
 	      containers:
 	        - name: configurator-load
-	          image: janssenproject/configurator:1.0.0_dev
+	          image: janssenproject/configurator:1.0.1_dev
 	          volumeMounts:
 	            - mountPath: /app/db/generate.json
 	              name: config-generate-params
@@ -187,7 +187,7 @@ The load command can be used either to generate or restore config and secret for
 	            name: secret-params
 	      containers:
 	        - name: configurator-load
-	          image: janssenproject/configurator:1.0.0_dev
+	          image: janssenproject/configurator:1.0.1_dev
 	          volumeMounts:
 	            - mountPath: /app/db/config.json
 	              name: config-params
@@ -221,7 +221,7 @@ docker run \
     -v /path/to/host/volume:/app/db \
     -v /path/to/vault_role_id.txt:/etc/certs/vault_role_id \
     -v /path/to/vault_secret_id.txt:/etc/certs/vault_secret_id \
-    janssenproject/configurator:1.0.0_dev dump
+    janssenproject/configurator:1.0.1_dev dump
 ```
 
 #### Kubernetes
@@ -237,7 +237,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: configurator-dump-job
-          image: janssenproject/configurator:1.0.0_dev
+          image: janssenproject/configurator:1.0.1_dev
           command:
             - /bin/sh
             - -c
@@ -252,4 +252,3 @@ spec:
 Copy over the files to host
 
 `kubectl cp config-init-load-job:/app/db .`
-
diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile
@@ -34,8 +34,8 @@ EXPOSE 8080
 # FIDO2
 # =====
 
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:24'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:13'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war
 
 # Install FIDO2
@@ -188,7 +188,7 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
 LABEL name="janssenproject/fido2" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen FIDO2" \
     description="FIDO2 server"

diff --git a/docker-jans-fido2/Makefile b/docker-jans-fido2/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/fido2
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-fido2/README.md b/docker-jans-fido2/README.md
@@ -5,7 +5,7 @@ Docker image packaging for Fido2.
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-fido2/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/fido2:1.0.0_dev`.
+For bleeding-edge/unstable version, use `janssenproject/fido2:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -93,4 +93,3 @@ The following key-value pairs are the defaults:
     "persistence_log_level": "INFO"
 }
 ```
-
diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile
@@ -172,7 +172,7 @@ ENV CN_CACHE_TYPE=NATIVE_PERSISTENCE \
 LABEL name="janssenproject/persistence-loader" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen Authorization Server Persistence loader" \
     description="Generate initial data for persistence layer"

diff --git a/docker-jans-persistence-loader/Makefile b/docker-jans-persistence-loader/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/persistence-loader
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"

diff --git a/docker-jans-persistence-loader/README.md b/docker-jans-persistence-loader/README.md
@@ -5,7 +5,7 @@ Persistence is a special container to load initial data for LDAP or Couchbase.
 ## Versions
 
 See [Releases](https://github.com/JanssenProject/docker-jans-persistence/releases) for stable versions.
-For bleeding-edge/unstable version, use `janssenproject/persistence:1.0.0_dev`.
+For bleeding-edge/unstable version, use `janssenproject/persistence:1.0.1_dev`.
 
 ## Environment Variables
 
@@ -111,7 +111,7 @@ docker run --rm \
     -e CN_LDAP_URL=ldap:1636 \
     -v /path/to/vault_role_id.txt:/etc/certs/vault_role_id \
     -v /path/to/vault_secret_id.txt:/etc/certs/vault_secret_id \
-    janssenproject/persistence:1.0.0_dev
+    janssenproject/persistence:1.0.1_dev
 ```
 
 The process may take awhile, check the output of the `persistence` container log.
@@ -147,7 +147,7 @@ docker run --rm \
     -v /path/to/couchbase_superuser_password:/etc/jans/conf/couchbase_superuser_password \
     -v /path/to/vault_role_id.txt:/etc/certs/vault_role_id \
     -v /path/to/vault_secret_id.txt:/etc/certs/vault_secret_id \
-    janssenproject/persistence:1.0.0_dev
+    janssenproject/persistence:1.0.1_dev
 ```
 
 The process may take awhile, check the output of the `persistence` container log.
@@ -211,6 +211,5 @@ Hybrid is a mix of LDAP and Couchbase persistence backend. To initialize data fo
         -v /path/to/couchbase_superuser_password:/etc/jans/conf/couchbase_superuser_password \
         -v /path/to/vault_role_id.txt:/etc/certs/vault_role_id \
         -v /path/to/vault_secret_id.txt:/etc/certs/vault_secret_id \
-        janssenproject/persistence:1.0.0_dev
+        janssenproject/persistence:1.0.1_dev
     ```
-
diff --git a/docker-jans-persistence-loader/scripts/upgrade.py b/docker-jans-persistence-loader/scripts/upgrade.py
@@ -100,6 +100,26 @@ def _transform_auth_dynamic_config(conf):
             conf["subjectIdentifiersPerClientSupported"] = ["mail", "uid"]
             should_update = True
 
+        if "agamaConfiguration" not in conf:
+            conf["agamaConfiguration"] = {
+                "enabled": False,
+                "templatesPath": "/ftl",
+                "scriptsPath": "/scripts",
+                "serializerType": "KRYO",
+                "interruptionTime": 0,
+                "maxItemsLoggedInCollections": 3,
+                "pageMismatchErrorPage": "mismatch.ftl",
+                "interruptionErrorPage": "timeout.ftl",
+                "crashErrorPage": "crash.ftl",
+                "finishedFlowPage": "finished.ftl",
+                "bridgeScriptPage": "agama.xhtml",
+                "defaultResponseHeaders": {
+                    "Content-Type": "text/html",
+                    "Expires": "0",
+                },
+            }
+            should_update = True
+
     if "forceSignedRequestObject" not in conf:
         conf["forceSignedRequestObject"] = False
         should_update = True

diff --git a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json
@@ -440,5 +440,22 @@
     "deviceAuthzTokenPollInterval": 5,
     "deviceAuthzResponseTypeToProcessAuthz": "code",
     "redirectUrisRegexEnabled": true,
-    "useHighestLevelScriptIfAcrScriptNotFound": true
+    "useHighestLevelScriptIfAcrScriptNotFound": true,
+    "agamaConfiguration": {
+        "enabled": false,
+        "templatesPath": "/ftl",
+        "scriptsPath": "/scripts",
+        "serializerType": "KRYO",
+        "interruptionTime": 0,
+        "maxItemsLoggedInCollections": 3,
+        "pageMismatchErrorPage": "mismatch.ftl",
+        "interruptionErrorPage": "timeout.ftl",
+        "crashErrorPage": "crash.ftl",
+        "finishedFlowPage": "finished.ftl",
+        "bridgeScriptPage": "agama.xhtml",
+        "defaultResponseHeaders": {
+            "Content-Type": "text/html",
+            "Expires": "0"
+        }
+    }
 }
diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile
@@ -44,8 +44,8 @@ RUN wget -q https://ox.gluu.org/maven/org/gluufederation/jython-installer/${JYTH
 # SCIM
 # ====
 
-ENV CN_VERSION=1.0.0
-ENV CN_BUILD_DATE='2022-05-19 16:26'
+ENV CN_VERSION=1.0.1-SNAPSHOT
+ENV CN_BUILD_DATE='2022-05-24 08:15'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war
 
 # Install SCIM
@@ -163,7 +163,7 @@ ENV CN_MAX_RAM_PERCENTAGE=75.0 \
 LABEL name="janssenproject/scim" \
     maintainer="Janssen Project <support@jans.io>" \
     vendor="Janssen Project" \
-    version="1.0.0" \
+    version="1.0.1" \
     release="1" \
     summary="Janssen SCIM" \
     description="SCIM server"

diff --git a/docker-jans-scim/Makefile b/docker-jans-scim/Makefile
@@ -1,6 +1,6 @@
-CN_VERSION=1.0.0
+CN_VERSION=1.0.1
 IMAGE_NAME=janssenproject/scim
-UNSTABLE_VERSION=dev
+UNSTABLE_VERSION?=dev
 
 build-dev:
 	@echo "[I] Building Docker image ${IMAGE_NAME}:${CN_VERSION}_${UNSTABLE_VERSION}"