diff --git a/docker/README b/docker/README index 32970da0..9713456e 100644 --- a/docker/README +++ b/docker/README @@ -1,3 +1,3 @@ -This directory and subdirectories contain files to build and manage Docker images of Salut à Toi. +This directory and subdirectories contain files to build and manage Docker images of Libervia. Please refer to documentation for details. diff --git a/docker/backend-dev/Dockerfile b/docker/backend-dev/Dockerfile index cdc8f736..d9b207df 100644 --- a/docker/backend-dev/Dockerfile +++ b/docker/backend-dev/Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN echo "Building image for Libervia ${REVISION:-dev}" && \ apt-get update && apt-get upgrade -y && \ - apt-get install -y --no-install-recommends locales python3-dev python3-venv python3-wheel mercurial libxml2-dev libxslt-dev libcairo2-dev libjpeg-dev libgirepository1.0-dev libdbus-1-dev libdbus-glib-1-dev dbus-x11 cmake && \ + apt-get install -y --no-install-recommends locales python3-dev python3-venv python3-wheel mercurial libxml2-dev libxslt-dev libcairo2-dev libjpeg-dev libgirepository1.0-dev libdbus-1-dev libdbus-glib-1-dev dbus-x11 cmake python3-gpg git && \ \ # will be used to put many Libervia specific data mkdir -p /usr/share/libervia/certificates && \ @@ -28,9 +28,21 @@ ENV DOCKER_LIBERVIA_REV=${REVISION:-dev} COPY --chown=root:root session.conf /usr/share/dbus-1/session.conf WORKDIR /home/libervia -USER libervia -RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && cd /src && \ +RUN apt-get install -y --no-install-recommends libsodium-dev +USER libervia +RUN python3 -m venv --system-site-packages libervia_env && libervia_env/bin/pip install -U pip wheel + +# temporary needed for new OMEMO +RUN libervia_env/bin/pip install protobuf==3.20 && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-xeddsa.git@stable && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-x3dh.git@stable && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-doubleratchet.git@stable && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-omemo.git@stable && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-oldmemo.git && \ + libervia_env/bin/pip install git+https://github.com/Syndace/python-twomemo.git + +RUN cd /src && \ # We install thoses packages in editable mode, so we can replace them easily with volumes. # We need to move *.egg-info (generated by pip) out of src dirs, otherwise mounting # local repos without it them cause troubles