Mercurial > sat_docs

changeset 106:8b228fd053bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker (base, libervia): use new getRepositoryData ability to save data in a .hg_data file
author Goffi <goffi@goffi.org>
date Sun, 28 Feb 2016 15:04:12 +0100
parents b69056368901
children 470dafe3f5b6
files docker/base/Dockerfile docker/libervia/Dockerfile
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/docker/base/Dockerfile	Sun Feb 28 02:01:20 2016 +0100
+++ b/docker/base/Dockerfile	Sun Feb 28 15:04:12 2016 +0100
@@ -64,7 +64,7 @@
 
 hg clone https://repos.goffi.org/urwid-satext && cd urwid-satext && \
 python setup.py install --prefix /usr --install-lib /usr/lib/python2.7/dist-packages && \
-rm -rf urwid-satext && \
+cd /tmp && rm -rf urwid-satext && \
 
 #####################
 # CORE INSTALLATION #
@@ -72,9 +72,9 @@
 
 hg clone https://repos.goffi.org/sat && cd sat && \
 python setup.py install --prefix /usr --install-lib /usr/lib/python2.7/dist-packages && \
-# we copy .hg/dirstate so SàT can get repository version
+# we save repository data so SàT can get repository version
 # TODO: should be done in setup.py in the future
-cp --parents .hg/dirstate /usr/lib/python2.7/dist-packages/sat && \
+python -c 'from sat.tools import utils;utils.getRepositoryData("/tmp/sat", is_path=True, save_dir_path="/usr/lib/python2.7/dist-packages/sat")' && \
 cd /tmp && rm -rf sat && \
 
 ######################
--- a/docker/libervia/Dockerfile	Sun Feb 28 02:01:20 2016 +0100
+++ b/docker/libervia/Dockerfile	Sun Feb 28 15:04:12 2016 +0100
@@ -63,16 +63,16 @@
 # LIBERVIA #
 ############
 
-hg clone https://repos.goffi.org/libervia && \
+cd /tmp && hg clone https://repos.goffi.org/libervia && \
 
 cd libervia && \
 
 python setup.py install && \
 
-# as for SàT backend, we copy .hg/dirstate so
-# Libervia can get repository version
+# as for SàT backend, we save repos data
+# so Libervia can get repository version
 # TODO: should be done in setup.py in the future
-cp --parents .hg/dirstate /usr/local/lib/python2.7/dist-packages/libervia && \
+python -c 'from sat.tools import utils;utils.getRepositoryData("/tmp/libervia", is_path=True, save_dir_path="/usr/local/lib/python2.7/dist-packages/libervia")' && \
 
 # some cleaning before finishing the layer
 cd /tmp && rm -rf libervia pyjamas /usr/local/bin/pyjsbuild