From 49a1d7f777d2edf4192beff4c5b83aa743f10cec Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Fri, 14 Apr 2017 11:03:35 +0200 Subject: [PATCH] Update Timeside submodule --- Dockerfile | 3 +-- lib/TimeSide | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd7a35ea..c23a4bbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM parisson/timeside:latest-dev +FROM parisson/timeside:latest MAINTAINER Guillaume Pellerin , Thomas fillon @@ -22,7 +22,6 @@ RUN mkdir -p /srv/src/ RUN mkdir /srv/src/telemeta COPY . /srv/src/telemeta WORKDIR /srv/src/telemeta - RUN conda install lxml RUN pip install -r requirements.txt RUN pip install -r requirements-dev.txt --src /srv/src diff --git a/lib/TimeSide b/lib/TimeSide index d37c07a4..dc644a8a 160000 --- a/lib/TimeSide +++ b/lib/TimeSide @@ -1 +1 @@ -Subproject commit d37c07a48c375f5c395c4159d8e09aa04fe599f6 +Subproject commit dc644a8a896c46f9c3adf90cb70ebe78f2f95e39 -- 2.39.5