# HG changeset patch # User Florent Aide <florent.aide@gmail.com> # Date 1409584707 -7200 # Mon Sep 01 17:18:27 2014 +0200 # Node ID b48996868581889c60765160b6b7867015eb4d4c # Parent f9f702a1fb5263c1e931dc562add7d151d5ddbd6 Added ure and libreoffice-java-common. Added a shared volume between the libreoffice server and py3o.renderserver diff --git a/Dockerfile b/Dockerfile --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:14.04 MAINTAINER florent.aide@gmail.com -RUN apt-get update && apt-get -y -q install openjdk-7-jre python-setuptools python-pip +RUN apt-get update && apt-get -y -q install openjdk-7-jre python-setuptools python-pip ure libreoffice-java-common ADD sources/ /opt/sources RUN pip install --upgrade --use-wheel --no-index --find-links=https://wheelhouse.openerp-experts.net -r /opt/sources/pip_reqs.txt diff --git a/run.sh b/run.sh --- a/run.sh +++ b/run.sh @@ -1,3 +1,3 @@ #!/bin/sh -docker run --name="py3o.renderserver" -p 8994:8994 --link ooo.server:oooserver xcgd/py3o.renderserver +docker run --name="py3o.renderserver" --rm -p 8994:8994 --link oooserver:oooserver --volumes-from oooserver xcgd/py3o.renderserver