From ccb272343fade2488066854c3a4a1d8aece2682a Mon Sep 17 00:00:00 2001
From: Philip ABBET <philip.abbet@idiap.ch>
Date: Thu, 14 Sep 2017 11:57:29 +0200
Subject: [PATCH] Update to beat.backend.python 1.2.2

---
 Dockerfile       | 16 +++++++---------
 environment.json |  7 +++++++
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 environment.json

diff --git a/Dockerfile b/Dockerfile
index 2605d34..dc85bd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,11 +43,10 @@ RUN set -ex \
       && bash Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2 \
       && conda config --add channels defaults \
       && conda config --add channels https://www.idiap.ch/software/bob/conda \
-      && conda create -y -n beat_env python=2.7 \
 
       # Install the needed packages
-      && source activate beat_env \
       && conda install -y \
+          python=2.7 \
           gevent \
           opencv=3.1.0 \
           numpy=1.12.1 \
@@ -85,22 +84,21 @@ RUN set -ex \
           bob.sp=2.0.8 \
 
       # Install the beat packages
-      && pip install -e git+https://gitlab.idiap.ch/beat/beat.backend.python.git@v1.1.6#egg=beat.backend.python \
+      && pip install -e git+https://gitlab.idiap.ch/beat/beat.backend.python.git@v1.2.2#egg=beat.backend.python \
 
       # Create the wrapper scripts for the executables
       && mkdir /usr/local/bin/beat \
-      && printf '#! /bin/bash\n\nsource activate beat_env\ndescribe $1 $2\n' > /usr/local/bin/beat/describe \
-      && printf '#! /bin/bash\n\nsource activate beat_env\nexecute $1 $2 $3\n' > /usr/local/bin/beat/execute \
+      && printf '#! /bin/bash\n\ndescribe $1 $2\n' > /usr/local/bin/beat/describe \
+      && printf '#! /bin/bash\n\nexecute $1 $2 $3\n' > /usr/local/bin/beat/execute \
       && chmod 755 /usr/local/bin/beat/describe \
       && chmod 755 /usr/local/bin/beat/execute \
 
-      # Customisation of the environment name
-      && mkdir /etc/beat \
-      && printf "{\n    \"name\": \"Scientific Python 2.7\",\n    \"version\": \"1.0.0\"\n}\n" > /etc/beat/environment.json \
-
       # Cleanup
       && conda clean -y -a \
       && apt-get purge -y --auto-remove git \
       && apt-get clean \
       && rm -rf /var/lib/apt/lists/* \
       && rm -rf /tmp/Miniconda2-latest-Linux-x86_64.sh
+
+# Customisation of the environment
+ADD environment.json /etc/beat/
diff --git a/environment.json b/environment.json
new file mode 100644
index 0000000..c446aea
--- /dev/null
+++ b/environment.json
@@ -0,0 +1,7 @@
+{
+    "name": "Scientific Python 2.7",
+    "version": "1.0.0",
+    "capabilities": [
+        "direct_access"
+    ]
+}
-- 
2.21.0