From 6f26fbd07f7d6252d6f4d530afd41b866d09811e Mon Sep 17 00:00:00 2001
From: xgaia <xgaia@gmx.com>
Date: Mon, 18 Dec 2017 12:20:43 +0100
Subject: [PATCH 1/2] create env when proxy prefix is set

---
 start.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index c38a16a..12c05fe 100644
--- a/start.sh
+++ b/start.sh
@@ -5,7 +5,7 @@ username="Galaxy" #FIXME: get the galaxy username
 pw_hash="" # no password
 salt="" # no salt
 
-# sed the dump tempalate
+# sed the dump template
 cp /dump.template.nq /dump.nq
 sed -i "s@__USERNAME__@$username@g" /dump.nq
 sed -i "s/__EMAIL__/$USER_EMAIL/g" /dump.nq
@@ -40,5 +40,13 @@ while ! wget -o /dev/null http://localhost:8890/conductor; do
     sleep 1s
 done
 
+# manage proxy
+if [[ $PROXY_PREFIX != "" ]]; then
+    # There is a proxy, export env for the askomics proxy
+    export ASKOCONFIG_app_colon_main_filter_hyphen_with='proxyprefix'
+    export ASKOCONFIG_filter_colon_proxyprefix_use='egg:PasteDeploy#prefix'
+    export ASKOCONFIG_filter_colon_proxyprefix_prefix=$PROXY_PREFIX
+fi
+
 # Start AskOmics
-${ASKOMICS_DIR}/startAskomics.sh -r -d dev
+${ASKOMICS_DIR}/startAskomics.sh -r

From ee90b6526fa6f64976aa558ffb6127e74779f16c Mon Sep 17 00:00:00 2001
From: xgaia <xgaia@gmx.com>
Date: Mon, 18 Dec 2017 12:20:54 +0100
Subject: [PATCH 2/2] target askomics 17.12

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 75b7113..7fa81d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Xavier Garnier 'xavier.garnier@irisa.fr'
 # Environment variables
 ENV ASKOMICS="https://github.com/askomics/askomics.git" \
     ASKOMICS_DIR="/usr/local/askomics" \
-    ASKOMICS_VERSION="17.09" \
+    ASKOMICS_VERSION="17.12" \
     SPARQL_UPDATE=true
 
 # Copy files