From 0ba1709bb54522b0b56648373ae52a52fd271ac2 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 20 Oct 2021 17:23:22 +0200 Subject: [PATCH] docker: use `@` instead of `tip` for dev images: `tip` links to most recent commit which may be on an other bookmark than the main one. By using `@`, we're sure that the main bookmark is used. --- docker/backend-dev/Dockerfile | 4 ++-- docker/libervia-web-dev/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/backend-dev/Dockerfile b/docker/backend-dev/Dockerfile index 70e88c26..ba429cd4 100644 --- a/docker/backend-dev/Dockerfile +++ b/docker/backend-dev/Dockerfile @@ -36,12 +36,12 @@ RUN python3 -m venv libervia_env && libervia_env/bin/pip install -U pip wheel && # 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:-tip}" && ~/libervia_env/bin/pip install -e sat_tmp && \ + 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:-tip}" && ~/libervia_env/bin/pip install -e 'libervia-backend[SVG]' && \ + 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 diff --git a/docker/libervia-web-dev/Dockerfile b/docker/libervia-web-dev/Dockerfile index 390f9479..8f9ba7b3 100644 --- a/docker/libervia-web-dev/Dockerfile +++ b/docker/libervia-web-dev/Dockerfile @@ -11,7 +11,7 @@ USER root RUN apt-get install -y --no-install-recommends yarnpkg WORKDIR /home/libervia USER libervia -RUN cd /src && hg clone https://repos.goffi.org/libervia-web -u "${REVISION:-tip}" && \ +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