From 12660a800bacb210bd3fb4b35c9156e9c5445343 Mon Sep 17 00:00:00 2001 From: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:55:51 +0000 Subject: [PATCH] chore: prepare docker images release 1.0.1-1 Release-As: 1.0.1-1 --- docker-jans-auth-server/Dockerfile | 12 ++++++------ docker-jans-auth-server/requirements.txt | 2 +- docker-jans-certmanager/Dockerfile | 4 ++-- docker-jans-certmanager/requirements.txt | 2 +- docker-jans-client-api/Dockerfile | 4 ++-- docker-jans-client-api/requirements.txt | 2 +- docker-jans-config-api/Dockerfile | 12 ++++++------ docker-jans-config-api/requirements.txt | 2 +- docker-jans-configurator/Dockerfile | 4 ++-- docker-jans-configurator/requirements.txt | 2 +- docker-jans-fido2/Dockerfile | 4 ++-- docker-jans-fido2/requirements.txt | 2 +- docker-jans-persistence-loader/Dockerfile | 2 +- docker-jans-persistence-loader/requirements.txt | 2 +- docker-jans-scim/Dockerfile | 4 ++-- docker-jans-scim/requirements.txt | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile index 5013567de49..a474c0ffae1 100644 --- 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.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-06-22 08:14' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:51' 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 @@ -87,15 +87,15 @@ ARG CASA_CONFIG_BUILD_DATE="2022-05-26 13:56" RUN wget -q https://jenkins.gluu.org/maven/org/gluu/casa-config/${CASA_CONFIG_VERSION}/casa-config-${CASA_CONFIG_VERSION}.jar -P /usr/share/java/ # A workaround for Fido2 integration -ARG FIDO2_CLIENT_VERSION=1.0.1-SNAPSHOT -ARG FIDO2_CLIENT_BUILD_DATE="2022-06-22 08:13" +ARG FIDO2_CLIENT_VERSION=1.0.1 +ARG FIDO2_CLIENT_BUILD_DATE="2022-07-06 12:49" RUN wget -q https://jenkins.jans.io/maven/io/jans/jans-fido2-client/${FIDO2_CLIENT_VERSION}/jans-fido2-client-${FIDO2_CLIENT_VERSION}.jar -P /usr/share/java/ # ===================== # Casa external scripts # ===================== -ARG FLEX_SOURCE_VERSION=87276ada2aa5004941e3fd6cc55833f5153f8254 +ARG FLEX_SOURCE_VERSION=99558e9998b5f1168e4b7b755cad7a7be00caa93 ARG CASA_EXTRAS_DIR=casa/extras RUN mkdir -p /opt/jans/python/libs @@ -117,7 +117,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \ ${JETTY_BASE}/jans-auth/agama/scripts # janssenproject/jans SHA commit -ARG JANS_SOURCE_VERSION=0f1a2e6761c0522acdfdab3d69adac5c8062e780 +ARG JANS_SOURCE_VERSION=7ad2b06edf70322d85b40de05a423c2f8cdd4200 # 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 diff --git a/docker-jans-auth-server/requirements.txt b/docker-jans-auth-server/requirements.txt index 559ff3c24bc..6317b036f71 100644 --- a/docker-jans-auth-server/requirements.txt +++ b/docker-jans-auth-server/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.41.0 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile index 319f34ab1e4..28af1c7d404 100644 --- 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.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-05-24 08:14' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:50' 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/ diff --git a/docker-jans-certmanager/requirements.txt b/docker-jans-certmanager/requirements.txt index 56a7e4a1d87..28568916cd0 100644 --- a/docker-jans-certmanager/requirements.txt +++ b/docker-jans-certmanager/requirements.txt @@ -2,4 +2,4 @@ grpcio==1.41.0 click==6.7 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-client-api/Dockerfile b/docker-jans-client-api/Dockerfile index 373de6e0106..37e5f1f7c7f 100644 --- a/docker-jans-client-api/Dockerfile +++ b/docker-jans-client-api/Dockerfile @@ -44,8 +44,8 @@ RUN wget -q https://ox.gluu.org/maven/org/gluufederation/jython-installer/${JYTH # Client API # ========== -ENV CN_VERSION=1.0.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-06-09 08:49' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:54' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-client-api-server/${CN_VERSION}/jans-client-api-server-${CN_VERSION}.war COPY jetty/jetty-env.xml /tmp/WEB-INF/jetty-env.xml diff --git a/docker-jans-client-api/requirements.txt b/docker-jans-client-api/requirements.txt index 8fc55cba307..9da2e93edb2 100644 --- a/docker-jans-client-api/requirements.txt +++ b/docker-jans-client-api/requirements.txt @@ -2,4 +2,4 @@ grpcio==1.41.0 ruamel.yaml==0.16.10 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile index b46acb0fa32..6d75beb6b45 100644 --- 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.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-06-29 11:17' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:54' 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 @@ -63,19 +63,19 @@ RUN wget -q https://github.com/GluuFederation/gluu-snap/raw/${PYFACTER_VERSION}/ RUN mkdir -p /usr/share/java -ENV SCIM_PLUGIN_BUILD_DATE='2022-06-29 11:18' +ENV SCIM_PLUGIN_BUILD_DATE='2022-07-06 12:55' 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 RUN wget -q ${SCIM_PLUGIN_SOURCE_URL} -O /usr/share/java/scim-plugin.jar -ENV ADMIN_UI_PLUGIN_BUILD_DATE='2022-06-29 11:18' +ENV ADMIN_UI_PLUGIN_BUILD_DATE='2022-07-06 12:54' 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 RUN wget -q ${ADMIN_UI_PLUGIN_SOURCE_URL} -O /usr/share/java/admin-ui-plugin.jar -ENV FIDO2_PLUGIN_BUILD_DATE='2022-06-29 11:18' +ENV FIDO2_PLUGIN_BUILD_DATE='2022-07-06 12:55' 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 RUN wget -q ${FIDO2_PLUGIN_SOURCE_URL} -O /usr/share/java/fido2-plugin.jar -ENV USER_MGT_PLUGIN_BUILD_DATE='2022-06-29 11:18' +ENV USER_MGT_PLUGIN_BUILD_DATE='2022-07-06 12:55' 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 RUN wget -q ${USER_MGT_PLUGIN_SOURCE_URL} -O /usr/share/java/user-mgt-plugin.jar diff --git a/docker-jans-config-api/requirements.txt b/docker-jans-config-api/requirements.txt index 559ff3c24bc..6317b036f71 100644 --- a/docker-jans-config-api/requirements.txt +++ b/docker-jans-config-api/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.41.0 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile index 55c69b758a1..ebc9a3d60ae 100644 --- 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.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-05-24 08:14' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:50' 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/ diff --git a/docker-jans-configurator/requirements.txt b/docker-jans-configurator/requirements.txt index 60075990175..cee0e4b8fb4 100644 --- a/docker-jans-configurator/requirements.txt +++ b/docker-jans-configurator/requirements.txt @@ -4,4 +4,4 @@ click==6.7 marshmallow==3.10.0 fqdn==1.4.0 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile index e0d2c9b0d7d..34cc2b6f69c 100644 --- a/docker-jans-fido2/Dockerfile +++ b/docker-jans-fido2/Dockerfile @@ -34,8 +34,8 @@ EXPOSE 8080 # FIDO2 # ===== -ENV CN_VERSION=1.0.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-06-22 08:13' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:50' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war # Install FIDO2 diff --git a/docker-jans-fido2/requirements.txt b/docker-jans-fido2/requirements.txt index 559ff3c24bc..6317b036f71 100644 --- a/docker-jans-fido2/requirements.txt +++ b/docker-jans-fido2/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.41.0 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile index a914ccdec40..b5e5cb1fb69 100644 --- a/docker-jans-persistence-loader/Dockerfile +++ b/docker-jans-persistence-loader/Dockerfile @@ -24,7 +24,7 @@ RUN python3 -m ensurepip \ # ===================== # janssenproject/jans SHA commit -ENV JANS_SOURCE_VERSION=377affc238bca236324dd8eeb9d9e6750879560f +ENV JANS_SOURCE_VERSION=7ad2b06edf70322d85b40de05a423c2f8cdd4200 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-persistence-loader/requirements.txt b/docker-jans-persistence-loader/requirements.txt index 1170cda6e9f..64913d1cb00 100644 --- a/docker-jans-persistence-loader/requirements.txt +++ b/docker-jans-persistence-loader/requirements.txt @@ -2,4 +2,4 @@ grpcio==1.41.0 libcst<0.4 ruamel.yaml==0.16.10 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile index 52988b6392a..0ed119c0140 100644 --- 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.1-SNAPSHOT -ENV CN_BUILD_DATE='2022-06-06 10:27' +ENV CN_VERSION=1.0.1 +ENV CN_BUILD_DATE='2022-07-06 12:52' ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war # Install SCIM diff --git a/docker-jans-scim/requirements.txt b/docker-jans-scim/requirements.txt index 559ff3c24bc..6317b036f71 100644 --- a/docker-jans-scim/requirements.txt +++ b/docker-jans-scim/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.41.0 libcst<0.4 -git+https://github.com/JanssenProject/jans@4f5f937123b0e1de969bf9b5c97564596363be44#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@7ad2b06edf70322d85b40de05a423c2f8cdd4200#egg=jans-pycloudlib&subdirectory=jans-pycloudlib