From a6b5b23e0d9a7b8acff8810555636385ee8da78d Mon Sep 17 00:00:00 2001 From: iromli Date: Wed, 20 Dec 2023 00:29:12 +0700 Subject: [PATCH] fix(docker-jans-all-in-one): incorrect image tags prevent image build Signed-off-by: iromli --- docker-jans-all-in-one/Dockerfile | 22 ++++++++++----------- docker-jans-all-in-one/app/requirements.txt | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile index fc87863a4bd..37c762ecf45 100644 --- a/docker-jans-all-in-one/Dockerfile +++ b/docker-jans-all-in-one/Dockerfile @@ -2,19 +2,19 @@ # Assets sources # ============== +# original Janssen version +ARG CN_VERSION=1.0.22 + # the following ARGs set default base images # they can be overriden in build process via --build-arg option -ARG JANS_CONFIGURATOR_IMAGE=ghcr.io/janssenproject/jans/configurator:1.0.22-SNAPSHOT_dev -ARG JANS_PERSISTENCE_LOADER_IMAGE=ghcr.io/janssenproject/jans/persistence-loader:1.0.22-SNAPSHOT_dev -ARG JANS_AUTH_IMAGE=ghcr.io/janssenproject/jans/auth-server:1.0.22-SNAPSHOT_dev -ARG JANS_CONFIG_API_IMAGE=ghcr.io/janssenproject/jans/config-api:1.0.22-SNAPSHOT_dev -ARG JANS_FIDO2_IMAGE=ghcr.io/janssenproject/jans/fido2:1.0.22-SNAPSHOT_dev -ARG JANS_SCIM_IMAGE=ghcr.io/janssenproject/jans/scim:1.0.22-SNAPSHOT_dev -ARG JANS_CASA_IMAGE=ghcr.io/janssenproject/jans/casa:1.0.22-SNAPSHOT_dev -ARG JANS_LINK_IMAGE=ghcr.io/janssenproject/jans/link:1.0.22-SNAPSHOT_dev - -# original Janssen version -ARG CN_VERSION=1.0.22-SNAPSHOT +ARG JANS_CONFIGURATOR_IMAGE=ghcr.io/janssenproject/jans/configurator:${CN_VERSION}_dev +ARG JANS_PERSISTENCE_LOADER_IMAGE=ghcr.io/janssenproject/jans/persistence-loader:${CN_VERSION}_dev +ARG JANS_AUTH_IMAGE=ghcr.io/janssenproject/jans/auth-server:${CN_VERSION}_dev +ARG JANS_CONFIG_API_IMAGE=ghcr.io/janssenproject/jans/config-api:${CN_VERSION}_dev +ARG JANS_FIDO2_IMAGE=ghcr.io/janssenproject/jans/fido2:${CN_VERSION}_dev +ARG JANS_SCIM_IMAGE=ghcr.io/janssenproject/jans/scim:${CN_VERSION}_dev +ARG JANS_CASA_IMAGE=ghcr.io/janssenproject/jans/casa:${CN_VERSION}_dev +ARG JANS_LINK_IMAGE=ghcr.io/janssenproject/jans/link:${CN_VERSION}_dev # ----------- # base images diff --git a/docker-jans-all-in-one/app/requirements.txt b/docker-jans-all-in-one/app/requirements.txt index ef4612c52af..a12b902f346 100644 --- a/docker-jans-all-in-one/app/requirements.txt +++ b/docker-jans-all-in-one/app/requirements.txt @@ -1,7 +1,7 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 libcst<0.4 -click==6.7 +click==8.1.7 marshmallow==3.20.1 fqdn==1.5.1 ruamel.yaml==0.18.5