From a16b010bdc8f1ea1949dd83baa789d3caa195a58 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Thu, 12 Sep 2019 09:56:13 +0200
Subject: [PATCH] Install models via an alternative way.

---
 Dockerfile  | 32 ++++++++++++++++----------------
 wrapper/nlp |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e6cc75..f36ec49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,25 +26,25 @@ RUN tar -xzf "pyflow-${PYFLOW_VERSION}.tar.gz" \
       "pyflow-${PYFLOW_VERSION}" \
       "pyflow-${PYFLOW_VERSION}.tar.gz"
 
-ENV SPACY_MODELS_DE=de_core_news_sm \
-    SPACY_MODELS_EL=el_core_news_sm \
-    SPACY_MODELS_EN=en_core_web_sm \
-    SPACY_MODELS_ES=es_core_news_sm \
-    SPACY_MODELS_FR=fr_core_news_sm \
-    SPACY_MODELS_IT=it_core_news_sm \
-    SPACY_MODELS_NL=nl_core_news_sm \
-    SPACY_MODELS_PT=pt_core_news_sm \
+ENV SPACY_MODEL_DE=de_core_news_sm \
+    SPACY_MODEL_EL=el_core_news_sm \
+    SPACY_MODEL_EN=en_core_web_sm \
+    SPACY_MODEL_ES=es_core_news_sm \
+    SPACY_MODEL_FR=fr_core_news_sm \
+    SPACY_MODEL_IT=it_core_news_sm \
+    SPACY_MODEL_NL=nl_core_news_sm \
+    SPACY_MODEL_PT=pt_core_news_sm \
     SPACY_VERSION=2.1.0
 RUN pip3 install \
       "spacy==${SPACY_VERSION}" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_DE}-${SPACY_VERSION}/${SPACY_MODELS_DE}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_EL}-${SPACY_VERSION}/${SPACY_MODELS_EL}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_EN}-${SPACY_VERSION}/${SPACY_MODELS_EN}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_ES}-${SPACY_VERSION}/${SPACY_MODELS_ES}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_FR}-${SPACY_VERSION}/${SPACY_MODELS_FR}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_IT}-${SPACY_VERSION}/${SPACY_MODELS_IT}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_NL}-${SPACY_VERSION}/${SPACY_MODELS_NL}-${SPACY_VERSION}.tar.gz" \
-      "https://github.com/explosion/spacy-models/releases/download/${SPACY_MODELS_PT}-${SPACY_VERSION}/${SPACY_MODELS_PT}-${SPACY_VERSION}.tar.gz"
+ && python3 -m spacy download "${SPACY_MODEL_DE}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_EL}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_EN}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_ES}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_FR}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_IT}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_NL}-${SPACY_VERSION}" --direct \
+ && python3 -m spacy download "${SPACY_MODEL_PT}-${SPACY_VERSION}" --direct
 
 
 # Install NLP pipeline
diff --git a/wrapper/nlp b/wrapper/nlp
index b9dfca9..330bc32 100755
--- a/wrapper/nlp
+++ b/wrapper/nlp
@@ -5,7 +5,7 @@ import argparse
 import os
 import subprocess
 
-container_image = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/nlp:latest'
+container_image = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/nlp:2.1.0'
 container_input_dir = '/input'
 container_output_dir = '/output'
 uid = str(os.getuid())