feat: exclude doc store and core message lib

.github/CODEOWNERS

@@ -27,7 +27,7 @@
 /jans-linux-setup/jans_setup/setup_app/version.py @moabu @mo-auto
 /jans-linux-setup/static/scripts/admin_ui_plugin.py @devrimyatar @duttarnab
 /jans-cache-refresh/ @yurem @shekhar16
-/jans-link/ @shekhar16
+/jans-link/ @yurem @yuriyz
 /agama/ @jgomer2001
 /jans-casa/ @jgomer2001 @maduvena
 /demos/jans-tarp/ @duttarnab

.github/workflows/docker_build_image.yml

@@ -60,8 +60,10 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
-          sparse-checkout: docker-jans-${{ matrix.docker-images }}
-
+          sparse-checkout: |
+            docker-jans-${{ matrix.docker-images }}
+            automation
+            demos
       - name: Check docker directories that changed
         id: build_docker_image
         run: |
@@ -136,9 +138,9 @@ jobs:
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "build=${BUILD}" >> $GITHUB_OUTPUT
           echo "dockerfilelocation=${DOCKER_FILE_LOCATION}" >> $GITHUB_OUTPUT
-          if [[ ! $VERSION =~ "_dev" ]]; then
-            # wait for all images in DEFAULT_ALL to be built before building the all-in-one image as it depends on all other images
-            if [[ "docker-jans-all-in-one" =~ "${{ matrix.docker-images }}" ]]; then
+          # wait for all images in DEFAULT_ALL to be built before building the all-in-one image as it depends on all other images
+          if [[ "docker-jans-all-in-one" =~ "${{ matrix.docker-images }}" ]]; then
+            if [[ ${{ github.event_name != 'pull_request' }} ]]; then
               TEMP_IMG="auth-server certmanager config-api configurator fido2 persistence-loader scim monolith loadtesting-jmeter link casa saml keycloak-link"
               for i in $TEMP_IMG; do
                 TEMP_TOKEN=$(curl https://ghcr.io/token\?scope\="repository:janssenproject/jans/$i:pull" | jq -r '.token')

docker-jans-all-in-one/Dockerfile

@@ -46,7 +46,7 @@ FROM ${JANS_SAML_IMAGE} AS jans-saml-src
 # app
 # ===
 
-FROM bellsoft/liberica-openjdk-alpine:17.0.8@sha256:e82fb905ca6efffcdb1b0ed58f207b0ce91aeada78c218ae7dbb16bb31635728
+FROM bellsoft/liberica-openjdk-alpine:17.0.9@sha256:915d7a6c5874638a735296a99ac28c4a9cefb9bfda2bef796fc564449d44d6cc
 
 # hadolint ignore=DL3018
 RUN apk update \
@@ -161,7 +161,7 @@ RUN mkdir -p /opt/jans/configurator/db \
 COPY app /app
 
 # CN version as env var (with suffix if any, i.e. SNAPSHOT)
-ENV CN_VERSION=1.1.0
+ENV CN_VERSION=1.1.0-SNAPSHOT
 
 # set directory contains installer code that will be added to Python sys.path
 ENV PYTHONPATH=/app

docker-jans-all-in-one/Makefile

@@ -1,27 +1,25 @@
-IMAGE_VERSION?=$(shell grep -Po 'org.opencontainers.image.version="\K.*?(?=")' Dockerfile)
-IMAGE_NAME?=$(shell grep -Po 'org.opencontainers.image.url="\K.*?(?=")' Dockerfile)
-DEV_VERSION?=$(shell echo ${IMAGE_VERSION} | cut -d '-' -f 1)_dev
+IMAGE_VERSION?=$(shell grep -Po 'org.opencontainers.image.version="\K.*?(?=")' Dockerfile)_dev
+IMAGE_URL=$(shell grep -Po 'org.opencontainers.image.url="\K.*?(?=")' Dockerfile)
+IMAGE?=${IMAGE_URL}:${IMAGE_VERSION}
 
-# pass extra build args, i.e. `make build-dev BUILD_ARGS="--no-cache"`
-BUILD_ARGS?=
-
-# pass extra trivy args, i.e. `make trivy-scan TRIVY_ARGS="-f json"`
-TRIVY_ARGS?=
-
-# pass extra build args, i.e. `make grype-scan GRYPE_ARGS="-o json"`
-GRYPE_ARGS?=
+# pass extra args to the targets, for example:
+#
+# - `make build-dev ARGS="--no-cache"`
+# - `make trivy-scan TRIVY_ARGS="-f json"`
+# - `make grype-scan GRYPE_ARGS="-o json"`
+ARGS?=
 
 .PHONY: test clean all build-dev trivy-scan grype-scan
 .DEFAULT_GOAL := build-dev
 
 build-dev:
-	@echo "[I] Building Docker image ${IMAGE_NAME}:${DEV_VERSION}"
-	@docker build --rm --force-rm ${BUILD_ARGS} -t ${IMAGE_NAME}:${DEV_VERSION} .
+	@echo "[I] Building OCI image ${IMAGE}"
+	@docker build --rm --force-rm ${ARGS} -t ${IMAGE} .
 
 trivy-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using trivy"
-	@trivy image --security-checks vuln ${TRIVY_ARGS} ${IMAGE_NAME}:${DEV_VERSION}
+	@echo "[I] Scanning OCI image ${IMAGE} using trivy"
+	@trivy image --scanners vuln ${ARGS} ${IMAGE}
 
 grype-scan:
-	@echo "[I] Scanning Docker image ${IMAGE_NAME}:${DEV_VERSION} using grype"
-	@grype -v ${GRYPE_ARGS} ${IMAGE_NAME}:${DEV_VERSION}
+	@echo "[I] Scanning OCI image ${IMAGE} using grype"
+	@grype -v ${ARGS} ${IMAGE}

docker-jans-all-in-one/app/requirements.txt

@@ -6,4 +6,4 @@ fqdn==1.5.1
 ruamel.yaml==0.18.5
 supervisor==4.2.5
 pluggy==1.3.0
-git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-auth-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjdk-alpine:17.0.8@sha256:e82fb905ca6efffcdb1b0ed58f207b0ce91aeada78c218ae7dbb16bb31635728
+FROM bellsoft/liberica-openjdk-alpine:17.0.9@sha256:915d7a6c5874638a735296a99ac28c4a9cefb9bfda2bef796fc564449d44d6cc
 
 # ===============
 # Alpine packages

docker-jans-auth-server/Makefile

@@ -18,7 +18,7 @@ build-dev:
 
 trivy-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using trivy"
-	@trivy image --security-checks vuln ${ARGS} ${IMAGE}
+	@trivy image --scanners vuln ${ARGS} ${IMAGE}
 
 grype-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using grype"

docker-jans-auth-server/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-auth-server/scripts/auth_conf.py

@@ -9,7 +9,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 
 def push_auth_conf(manager) -> None:

docker-jans-auth-server/scripts/bootstrap.py

@@ -23,7 +23,7 @@
 from lock import LockPersistenceSetup
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 manager = get_manager()
 

docker-jans-auth-server/scripts/jks_sync.py

@@ -12,7 +12,7 @@
 manager = get_manager()
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 
 def jks_created():

docker-jans-auth-server/scripts/lock.py

@@ -17,7 +17,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 manager = get_manager()
 

docker-jans-auth-server/scripts/mod_context.py

@@ -15,7 +15,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 
 Library = namedtuple("Library", ["path", "basename", "meta"])

docker-jans-auth-server/scripts/settings.py

@@ -17,7 +17,7 @@
             "level": "INFO",
             "propagate": True,
         },
-        "auth": {
+        "jans-auth": {
             "handlers": ["console"],
             "level": "INFO",
             "propagate": False,

docker-jans-auth-server/scripts/upgrade.py

@@ -18,7 +18,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("auth")
+logger = logging.getLogger("jans-auth")
 
 Entry = namedtuple("Entry", ["id", "attrs"])
 

docker-jans-auth-server/templates/jans-auth/log4j2.xml

@@ -2,7 +2,7 @@
 
 <Configuration packages="io.jans.log">
     <Properties>
-        <Property name="auth.log.console.prefix" value="auth" />
+        <Property name="auth.log.console.prefix" value="jans-auth" />
     </Properties>
 	<Appenders>
 		<Console name="STDOUT" target="SYSTEM_OUT">

docker-jans-auth-server/templates/jans-lock/log4j2-lock.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration>
     <Properties>
-        <Property name="lock.log.console.prefix" value="auth-lock" />
+        <Property name="lock.log.console.prefix" value="jans-auth-lock" />
     </Properties>
     <Appenders>
         <Console name="Lock_Console" target="SYSTEM_OUT">

docker-jans-casa/Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjre-alpine:17.0.8@sha256:156b75d18d01f1a83f9a279e80dad82773c212559b20e40620ccb06b1120ce4f
+FROM bellsoft/liberica-openjre-alpine:17.0.9@sha256:7c9948b1e267037b7cadfe448e732b9cb719bfd38d8c5811f2f2d33cc0c05123
 
 # ===============
 # Alpine packages

docker-jans-casa/requirements.txt

@@ -1,4 +1,4 @@
 webdavclient3>=3.14.5
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-casa/scripts/auth_conf.py

@@ -7,7 +7,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("casa")
+logger = logging.getLogger("jans-casa")
 
 
 manager = get_manager()

docker-jans-casa/scripts/bootstrap.py

@@ -33,7 +33,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("casa")
+logger = logging.getLogger("jans-casa")
 
 manager = get_manager()
 

docker-jans-casa/scripts/jca_sync.py

@@ -16,7 +16,7 @@
 TMP_DIR = "/tmp/webdav"
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("casa")
+logger = logging.getLogger("jans-casa")
 
 
 def sync_from_webdav(url, username, password):

docker-jans-casa/scripts/mod_context.py

@@ -14,7 +14,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("casa")
+logger = logging.getLogger("jans-casa")
 
 
 Library = namedtuple("Library", ["path", "basename", "meta"])

docker-jans-casa/scripts/settings.py

@@ -17,7 +17,7 @@
             "level": "INFO",
             "propagate": True,
         },
-        "casa": {
+        "jans-casa": {
             "handlers": ["console"],
             "level": "INFO",
             "propagate": False,

docker-jans-casa/scripts/upgrade.py

@@ -18,7 +18,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("casa")
+logger = logging.getLogger("jans-casa")
 
 Entry = namedtuple("Entry", ["id", "attrs"])
 

docker-jans-casa/templates/jans-casa/log4j2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="ERROR">
     <Properties>
-        <Property name="casa.log.console.prefix" value="casa" />
+        <Property name="casa.log.console.prefix" value="jans-casa" />
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">

docker-jans-certmanager/Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjre-alpine:17.0.8@sha256:156b75d18d01f1a83f9a279e80dad82773c212559b20e40620ccb06b1120ce4f
+FROM bellsoft/liberica-openjre-alpine:17.0.9@sha256:7c9948b1e267037b7cadfe448e732b9cb719bfd38d8c5811f2f2d33cc0c05123
 
 # ===============
 # Alpine packages

docker-jans-certmanager/Makefile

@@ -18,7 +18,7 @@ build-dev:
 
 trivy-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using trivy"
-	@trivy image --security-checks vuln ${ARGS} ${IMAGE}
+	@trivy image --scanners vuln ${ARGS} ${IMAGE}
 
 grype-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using grype"

docker-jans-certmanager/requirements.txt

@@ -1,4 +1,4 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
 click==8.1.7
-git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-config-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjre-alpine:17.0.8@sha256:156b75d18d01f1a83f9a279e80dad82773c212559b20e40620ccb06b1120ce4f
+FROM bellsoft/liberica-openjre-alpine:17.0.9@sha256:7c9948b1e267037b7cadfe448e732b9cb719bfd38d8c5811f2f2d33cc0c05123
 
 # ===============
 # Alpine packages
@@ -40,7 +40,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
 # Config API
 # ==========
 
-ENV CN_VERSION=1.1.0
+ENV CN_VERSION=1.1.0-SNAPSHOT
 ENV CN_BUILD_DATE='2024-02-02 12:43'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war
 

docker-jans-config-api/Makefile

@@ -18,7 +18,7 @@ build-dev:
 
 trivy-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using trivy"
-	@trivy image --security-checks vuln ${ARGS} ${IMAGE}
+	@trivy image --scanners vuln ${ARGS} ${IMAGE}
 
 grype-scan:
 	@echo "[I] Scanning OCI image ${IMAGE} using grype"

docker-jans-config-api/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@2eb603e383e54611783435af82f2492da3050c3b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@0df521304ba836b2d38480578b7668c8f2e89a85#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-config-api/scripts/bootstrap.py

@@ -38,7 +38,7 @@
 from utils import get_config_api_scope_mapping
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("config-api")
+logger = logging.getLogger("jans-config-api")
 
 
 def main():

docker-jans-config-api/scripts/mod_context.py

@@ -14,7 +14,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("config-api")
+logger = logging.getLogger("jans-config-api")
 
 
 Library = namedtuple("Library", ["path", "basename", "meta"])

docker-jans-config-api/scripts/plugins.py

@@ -7,7 +7,7 @@
 from settings import LOGGING_CONFIG
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("config-api")
+logger = logging.getLogger("jans-config-api")
 
 SUPPORTED_PLUGINS = (
     "admin-ui",

docker-jans-config-api/scripts/settings.py

@@ -17,7 +17,7 @@
             "level": "INFO",
             "propagate": True,
         },
-        "config-api": {
+        "jans-config-api": {
             "handlers": ["console"],
             "level": "INFO",
             "propagate": False,

docker-jans-config-api/scripts/upgrade.py

@@ -17,7 +17,7 @@
 from utils import get_config_api_scope_mapping
 
 logging.config.dictConfig(LOGGING_CONFIG)
-logger = logging.getLogger("config-api")
+logger = logging.getLogger("jans-config-api")
 
 Entry = namedtuple("Entry", ["id", "attrs"])
 

docker-jans-config-api/templates/jans-config-api/log4j2-adminui.xml

@@ -2,7 +2,7 @@
 
 <Configuration packages="io.jans.log">
     <Properties>
-        <Property name="admin_ui.log.console.prefix" value="config-api" />
+        <Property name="admin_ui.log.console.prefix" value="jans-config-api" />
     </Properties>
     <Appenders>
         <Console name="AdminUI_Console" target="SYSTEM_OUT">

docker-jans-config-api/templates/jans-config-api/log4j2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="ERROR">
     <Properties>
-        <Property name="config_api.log.console.prefix" value="config-api" />
+        <Property name="config_api.log.console.prefix" value="jans-config-api" />
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">

docker-jans-configurator/Dockerfile

@@ -1,4 +1,4 @@
-FROM bellsoft/liberica-openjre-alpine:17.0.8@sha256:156b75d18d01f1a83f9a279e80dad82773c212559b20e40620ccb06b1120ce4f
+FROM bellsoft/liberica-openjre-alpine:17.0.9@sha256:7c9948b1e267037b7cadfe448e732b9cb719bfd38d8c5811f2f2d33cc0c05123
 
 # ===============
 # Alpine packages