From dba7f48d96d8a558be6d1eb6dcc92d8e4e43aaa4 Mon Sep 17 00:00:00 2001 From: iromli Date: Sat, 28 Dec 2024 06:10:07 +0700 Subject: [PATCH 1/4] fix(cloud-native): resolve image builds on slow network Signed-off-by: iromli --- docker-jans-all-in-one/Dockerfile | 9 ++++++--- docker-jans-auth-server/Dockerfile | 9 ++++++--- docker-jans-casa/Dockerfile | 9 ++++++--- docker-jans-certmanager/Dockerfile | 9 ++++++--- docker-jans-config-api/Dockerfile | 9 ++++++--- docker-jans-configurator/Dockerfile | 9 ++++++--- docker-jans-fido2/Dockerfile | 9 ++++++--- docker-jans-kc-scheduler/Dockerfile | 9 ++++++--- docker-jans-keycloak-link/Dockerfile | 9 ++++++--- docker-jans-link/Dockerfile | 9 ++++++--- docker-jans-persistence-loader/Dockerfile | 9 ++++++--- docker-jans-saml/Dockerfile | 9 ++++++--- docker-jans-scim/Dockerfile | 9 ++++++--- 13 files changed, 78 insertions(+), 39 deletions(-) diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile index 9fb90fa51fe..7970ab67a40 100644 --- a/docker-jans-all-in-one/Dockerfile +++ b/docker-jans-all-in-one/Dockerfile @@ -62,7 +62,8 @@ ENV JANS_SOURCE_VERSION=aa1b2edaa8d7e3413bd57a7bd7cc86206086768b # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -72,11 +73,13 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja # Python # ------ +# default pip timeout +ARG PIP_TIMEOUT=15 COPY /app/requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ------- diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile index 119cde6e896..fafa70ca6ca 100644 --- a/docker-jans-auth-server/Dockerfile +++ b/docker-jans-auth-server/Dockerfile @@ -99,7 +99,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -126,11 +127,13 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-casa/Dockerfile b/docker-jans-casa/Dockerfile index 68c3da7523b..1ef81561f64 100644 --- a/docker-jans-casa/Dockerfile +++ b/docker-jans-casa/Dockerfile @@ -65,7 +65,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -93,11 +94,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile index 48205d6ebc3..5afda7f537a 100644 --- a/docker-jans-certmanager/Dockerfile +++ b/docker-jans-certmanager/Dockerfile @@ -29,7 +29,8 @@ ENV JANS_SOURCE_VERSION=aa1b2edaa8d7e3413bd57a7bd7cc86206086768b # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -39,11 +40,13 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ======= diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile index f04b77597eb..98c2317c2c8 100644 --- a/docker-jans-config-api/Dockerfile +++ b/docker-jans-config-api/Dockerfile @@ -76,7 +76,8 @@ ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -117,11 +118,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile index 9c458a69b04..6b8434bba5b 100644 --- a/docker-jans-configurator/Dockerfile +++ b/docker-jans-configurator/Dockerfile @@ -29,7 +29,8 @@ RUN mkdir -p /opt/jans/configurator/javalibs \ ENV JANS_SOURCE_VERSION=aa1b2edaa8d7e3413bd57a7bd7cc86206086768b -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -39,11 +40,13 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ======= diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile index 60dcbfc202b..3a233d17bfa 100644 --- a/docker-jans-fido2/Dockerfile +++ b/docker-jans-fido2/Dockerfile @@ -66,7 +66,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -105,11 +106,13 @@ RUN wget -q https://www.apple.com/certificateauthority/Apple_WebAuthn_Root_CA.pe # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-kc-scheduler/Dockerfile b/docker-jans-kc-scheduler/Dockerfile index e6203526a0b..06886c4d5a1 100644 --- a/docker-jans-kc-scheduler/Dockerfile +++ b/docker-jans-kc-scheduler/Dockerfile @@ -42,7 +42,8 @@ ENV JANS_SOURCE_VERSION=aa1b2edaa8d7e3413bd57a7bd7cc86206086768b # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -52,11 +53,13 @@ RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/ja # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ======= diff --git a/docker-jans-keycloak-link/Dockerfile b/docker-jans-keycloak-link/Dockerfile index f62c8e93d6b..704e11812de 100644 --- a/docker-jans-keycloak-link/Dockerfile +++ b/docker-jans-keycloak-link/Dockerfile @@ -66,7 +66,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -97,11 +98,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-link/Dockerfile b/docker-jans-link/Dockerfile index 1f5c65de7bd..2d9cf8ce58e 100644 --- a/docker-jans-link/Dockerfile +++ b/docker-jans-link/Dockerfile @@ -66,7 +66,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -97,11 +98,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile index 2327a9cf9a5..5be105996e7 100644 --- a/docker-jans-persistence-loader/Dockerfile +++ b/docker-jans-persistence-loader/Dockerfile @@ -23,7 +23,8 @@ ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -53,11 +54,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ======= diff --git a/docker-jans-saml/Dockerfile b/docker-jans-saml/Dockerfile index f7600e0bf0c..33177100579 100644 --- a/docker-jans-saml/Dockerfile +++ b/docker-jans-saml/Dockerfile @@ -40,7 +40,8 @@ ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -65,11 +66,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ======= diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile index 4df315d14ff..5b2ffdc6909 100644 --- a/docker-jans-scim/Dockerfile +++ b/docker-jans-scim/Dockerfile @@ -66,7 +66,8 @@ ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources # 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 -RUN git clone --depth 500 --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ +ARG GIT_CLONE_DEPTH=100 +RUN git clone --depth ${GIT_CLONE_DEPTH} --filter blob:none --no-checkout https://github.com/janssenproject/jans /tmp/jans \ && cd /tmp/jans \ && git sparse-checkout init --cone \ && git checkout ${JANS_SOURCE_VERSION} \ @@ -99,11 +100,13 @@ RUN cd /tmp/jans \ # Python # ====== +# default pip timeout +ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools \ - && pip3 install --no-cache-dir -r /app/requirements.txt \ + && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel # ========== From f91e0eb0cbe8835822e3f64f015c9bbc0f78da71 Mon Sep 17 00:00:00 2001 From: iromli Date: Tue, 31 Dec 2024 05:05:40 +0700 Subject: [PATCH 2/4] build(cloud-native): remove unnecessary pip's option Signed-off-by: iromli --- docker-jans-all-in-one/Dockerfile | 2 +- docker-jans-auth-server/Dockerfile | 2 +- docker-jans-casa/Dockerfile | 2 +- docker-jans-certmanager/Dockerfile | 2 +- docker-jans-config-api/Dockerfile | 2 +- docker-jans-configurator/Dockerfile | 2 +- docker-jans-fido2/Dockerfile | 2 +- docker-jans-kc-scheduler/Dockerfile | 2 +- docker-jans-keycloak-link/Dockerfile | 2 +- docker-jans-link/Dockerfile | 2 +- docker-jans-persistence-loader/Dockerfile | 2 +- docker-jans-saml/Dockerfile | 2 +- docker-jans-scim/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-jans-all-in-one/Dockerfile b/docker-jans-all-in-one/Dockerfile index 7970ab67a40..6591e7a7424 100644 --- a/docker-jans-all-in-one/Dockerfile +++ b/docker-jans-all-in-one/Dockerfile @@ -78,7 +78,7 @@ ARG PIP_TIMEOUT=15 COPY /app/requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile index fafa70ca6ca..0e35b582bef 100644 --- a/docker-jans-auth-server/Dockerfile +++ b/docker-jans-auth-server/Dockerfile @@ -132,7 +132,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-casa/Dockerfile b/docker-jans-casa/Dockerfile index 1ef81561f64..9f4beb98f2d 100644 --- a/docker-jans-casa/Dockerfile +++ b/docker-jans-casa/Dockerfile @@ -99,7 +99,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-certmanager/Dockerfile b/docker-jans-certmanager/Dockerfile index 5afda7f537a..d14f8d2f8b8 100644 --- a/docker-jans-certmanager/Dockerfile +++ b/docker-jans-certmanager/Dockerfile @@ -45,7 +45,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile index 98c2317c2c8..ece0aef0c42 100644 --- a/docker-jans-config-api/Dockerfile +++ b/docker-jans-config-api/Dockerfile @@ -123,7 +123,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-configurator/Dockerfile b/docker-jans-configurator/Dockerfile index 6b8434bba5b..3b9acd83810 100644 --- a/docker-jans-configurator/Dockerfile +++ b/docker-jans-configurator/Dockerfile @@ -45,7 +45,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile index 3a233d17bfa..c5aad76a3b6 100644 --- a/docker-jans-fido2/Dockerfile +++ b/docker-jans-fido2/Dockerfile @@ -111,7 +111,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-kc-scheduler/Dockerfile b/docker-jans-kc-scheduler/Dockerfile index 06886c4d5a1..686d061ed6b 100644 --- a/docker-jans-kc-scheduler/Dockerfile +++ b/docker-jans-kc-scheduler/Dockerfile @@ -58,7 +58,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-keycloak-link/Dockerfile b/docker-jans-keycloak-link/Dockerfile index 704e11812de..c8663bbedb4 100644 --- a/docker-jans-keycloak-link/Dockerfile +++ b/docker-jans-keycloak-link/Dockerfile @@ -103,7 +103,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-link/Dockerfile b/docker-jans-link/Dockerfile index 2d9cf8ce58e..fb7381450bc 100644 --- a/docker-jans-link/Dockerfile +++ b/docker-jans-link/Dockerfile @@ -103,7 +103,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-persistence-loader/Dockerfile b/docker-jans-persistence-loader/Dockerfile index 5be105996e7..bb662da7577 100644 --- a/docker-jans-persistence-loader/Dockerfile +++ b/docker-jans-persistence-loader/Dockerfile @@ -59,7 +59,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-saml/Dockerfile b/docker-jans-saml/Dockerfile index 33177100579..222834ca2bc 100644 --- a/docker-jans-saml/Dockerfile +++ b/docker-jans-saml/Dockerfile @@ -71,7 +71,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile index 5b2ffdc6909..5a3d48c1857 100644 --- a/docker-jans-scim/Dockerfile +++ b/docker-jans-scim/Dockerfile @@ -105,7 +105,7 @@ ARG PIP_TIMEOUT=15 COPY requirements.txt /app/requirements.txt RUN mv /usr/lib/python3.12/EXTERNALLY-MANAGED /usr/lib/python3.12/EXTERNALLY-MANAGED.disabled \ && python3 -m ensurepip \ - && pip3 install --no-cache-dir -U pip wheel setuptools --no-build-isolation --timeout ${PIP_TIMEOUT} \ + && pip3 install --no-cache-dir -U pip wheel setuptools --timeout ${PIP_TIMEOUT} \ && pip3 install --no-cache-dir -r /app/requirements.txt --timeout ${PIP_TIMEOUT} \ && pip3 uninstall -y pip wheel From 1012d005abb9e3c083cc987fb88d4577da8a2725 Mon Sep 17 00:00:00 2001 From: moabu <47318409+moabu@users.noreply.github.com> Date: Tue, 31 Dec 2024 14:52:52 +0300 Subject: [PATCH 3/4] ci: handle nightly image tag --- .github/workflows/build-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 537b985ddfc..d398da52eca 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -247,5 +247,5 @@ jobs: images+="${tag}@${DIGEST} " done if [[ -n $images ]]; then - cosign sign --yes -a author=JanssenProject ${images} + cosign sign --yes -a author=JanssenProject ${images} || echo "Failed to sign images" fi From b7ef4288b9e926cb3e6eaa55a54576d67f1d8b31 Mon Sep 17 00:00:00 2001 From: moabu <47318409+moabu@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:11:17 +0000 Subject: [PATCH 4/4] ci: update falsk cedarling source --- jans-cedarling/flask-sidecar/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jans-cedarling/flask-sidecar/Dockerfile b/jans-cedarling/flask-sidecar/Dockerfile index 3da6f39d5fc..1396235729c 100644 --- a/jans-cedarling/flask-sidecar/Dockerfile +++ b/jans-cedarling/flask-sidecar/Dockerfile @@ -31,7 +31,7 @@ RUN pip3 install "poetry==$POETRY_VERSION" gunicorn \ # =============== # Project setup # =============== -ENV JANS_SOURCE_VERSION=aa1b2edaa8d7e3413bd57a7bd7cc86206086768b +ENV JANS_SOURCE_VERSION=9610bc15908331e8344dfaed16ee8a397bd999d5 COPY docker-entrypoint.sh / RUN chmod +x /docker-entrypoint.sh