From 1244a2035b994681cd75630187a958a4e04a00d1 Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 23 Jan 2024 10:41:20 +0100 Subject: [PATCH] make didkit pip work --- docker/idhub.Dockerfile | 9 +++++---- pull-repos.sh | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docker/idhub.Dockerfile b/docker/idhub.Dockerfile index b24b9f1..f9dd11c 100644 --- a/docker/idhub.Dockerfile +++ b/docker/idhub.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim # last line is dependencies for weasyprint (for generating pdfs in lafede pilot) https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11 RUN apt update && apt-get install -y \ @@ -13,10 +13,11 @@ RUN apt update && apt-get install -y \ WORKDIR /opt/idhub -RUN python3 -m pip install --upgrade pip +RUN python3 -m pip install --upgrade pip --break-system-packages -COPY IdHub/requirements.txt / -RUN pip install -r /requirements.txt +COPY ssikit_trustchain/didkit-0.3.2-cp311-cp311-manylinux_2_34_x86_64.whl /opt/idhub +COPY IdHub/requirements.txt /opt/idhub +RUN pip install -r requirements.txt --break-system-packages COPY docker/idhub.entrypoint.sh / ENTRYPOINT sh /idhub.entrypoint.sh diff --git a/pull-repos.sh b/pull-repos.sh index 4702402..b6d1641 100755 --- a/pull-repos.sh +++ b/pull-repos.sh @@ -18,7 +18,7 @@ _pull() { git pull cd - else - git clone "${myurl}" "${mydir}" + git clone -b "${mybranch}" "${myurl}" "${mydir}" fi } @@ -27,7 +27,11 @@ main() { _pull 'https://gitea.pangea.org/pangea/django-orchestra' 'sso' _pull 'https://gitea.pangea.org/pangea/django-musician' 'sso' _pull 'git@gitea.pangea.org:trustchain-oc1-orchestral/IdHub.git' 'main' - _pull 'git@gitea.pangea.org:trustchain-oc1-orchestral/authentik.git' 'sso' + _pull 'git@gitea.pangea.org:trustchain-oc1-orchestral/authentik.git' 'trustchain-oc1-orchestral' + # we only use this to get idhub dependency + # didkit-0.3.2-cp311-cp311-manylinux_2_34_x86_64.whl + _pull 'git@gitea.pangea.org:trustchain-oc1-orchestral/ssikit_trustchain.git' 'master' + } main "${@}"