changeset 3730:43cc8c27adc7

docker: don't move `.egg_info` files anymore: moving `.egg_info` cause trouble, and doesn't seem necessary anymore.
author Goffi <goffi@goffi.org>
date Mon, 31 Jan 2022 18:35:52 +0100 (2022-01-31)
parents 86eea17cafa7
children 7e51cfc36d4e
files docker/backend-dev/Dockerfile docker/libervia-web-dev/Dockerfile docker/pubsub/Dockerfile
diffstat 3 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/docker/backend-dev/Dockerfile	Mon Jan 31 18:35:49 2022 +0100
+++ b/docker/backend-dev/Dockerfile	Mon Jan 31 18:35:52 2022 +0100
@@ -35,14 +35,10 @@
     # We need to move *.egg-info (generated by pip) out of src dirs, otherwise mounting
     # local repos without it them cause troubles
     hg clone https://repos.goffi.org/urwid-satext && ~/libervia_env/bin/pip install -e urwid-satext && \
-    mv urwid-satext/urwid_satext.egg-info ~/libervia_env/lib/python3.*/site-packages && \
     hg clone https://repos.goffi.org/sat_tmp -u "${REVISION:-@}" && ~/libervia_env/bin/pip install -e sat_tmp && \
-    mv sat_tmp/sat_tmp.egg-info ~/libervia_env/lib/python3.*/site-packages && \
     hg clone https://repos.goffi.org/libervia-templates && ~/libervia_env/bin/pip install -e libervia-templates && \
-    mv libervia-templates/libervia_templates.egg-info ~/libervia_env/lib/python3.*/site-packages && \
     hg clone https://repos.goffi.org/libervia-media && \
     hg clone https://repos.goffi.org/libervia-backend -u "${REVISION:-@}" && ~/libervia_env/bin/pip install -e 'libervia-backend[SVG]' && \
-    mv libervia-backend/libervia_backend.egg-info ~/libervia_env/lib/python3.*/site-packages && \
     mkdir -p /home/libervia/.local/share/libervia
 
 ENV DBUS_SESSION_BUS_ADDRESS="tcp:host=backend,port=55555,family=ipv4;unix:path=/home/libervia/.local/share/libervia/dbus_socket"
--- a/docker/libervia-web-dev/Dockerfile	Mon Jan 31 18:35:49 2022 +0100
+++ b/docker/libervia-web-dev/Dockerfile	Mon Jan 31 18:35:52 2022 +0100
@@ -12,8 +12,7 @@
 WORKDIR /home/libervia
 USER libervia
 RUN cd /src && hg clone https://repos.goffi.org/libervia-web -u "${REVISION:-@}" && \
-    ~/libervia_env/bin/pip install -e libervia-web && \
-    mv libervia-web/libervia_web.egg-info ~/libervia_env/lib/python3.*/site-packages
+    ~/libervia_env/bin/pip install -e libervia-web
 
 RUN ./entrypoint.sh \
     # we build here to avoid re-downloading node modules or other browser
--- a/docker/pubsub/Dockerfile	Mon Jan 31 18:35:49 2022 +0100
+++ b/docker/pubsub/Dockerfile	Mon Jan 31 18:35:52 2022 +0100
@@ -27,8 +27,6 @@
 RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && cd /src && \
     # we install thoses packages in editable mode, so we can replace them easily with volumes
     hg clone https://repos.goffi.org/sat_tmp && ~/libervia_env/bin/pip install -e sat_tmp && \
-    mv sat_tmp/sat_tmp.egg-info ~/libervia_env/lib/python3.*/site-packages && \
-    hg clone https://repos.goffi.org/sat_pubsub && ~/libervia_env/bin/pip install -e sat_pubsub && \
-    mv sat_pubsub/sat_pubsub.egg-info ~/libervia_env/lib/python3.*/site-packages
+    hg clone https://repos.goffi.org/sat_pubsub && ~/libervia_env/bin/pip install -e sat_pubsub
 
 ENTRYPOINT ["/home/libervia/entrypoint.sh"]