From f02c0953bf29bf1d99deb4cb8a1a8bb67c845d22 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <pjentsch@sfb1288inf-Notebook.fritz.box>
Date: Thu, 8 Oct 2020 23:08:49 +0200
Subject: [PATCH] Use new Dockerfile structure

---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 34a8e30..9e96f6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,28 +7,30 @@ LABEL authors="Patrick Jentsch <p.jentsch@uni-bielefeld.de>, Stephan Porada <spo
 ENV LANG=C.UTF-8
 
 
-RUN apt-get update
-
-
+# Install pipeline dependencies #
 ## Install pyFlow ##
 ENV PYFLOW_RELEASE=1.1.20
 ADD "https://github.com/Illumina/pyflow/releases/download/v${PYFLOW_RELEASE}/pyflow-${PYFLOW_RELEASE}.tar.gz" .
 RUN tar -xzf "pyflow-${PYFLOW_RELEASE}.tar.gz" \
  && cd "pyflow-${PYFLOW_RELEASE}" \
- && apt-get install -y --no-install-recommends \
+ && apt-get update \
+ && apt-get install --no-install-recommends --yes \
       python2.7 \
+ && rm -r /var/lib/apt/lists/* \
  && python2.7 setup.py build install \
  && cd .. \
  && rm -r "pyflow-${PYFLOW_RELEASE}" "pyflow-${PYFLOW_RELEASE}.tar.gz"
 
 
-## Install Pipeline ##
+## Install spaCy ##
 ENV SPACY_VERSION=2.3.2
 ENV SPACY_MODELS_VERSION=2.3.0
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update \
+ && apt-get install --no-install-recommends --yes \
       python3.7 \
       python3-pip \
       zip \
+ && rm -r /var/lib/apt/lists/* \
  && pip3 install \
       chardet \
       setuptools \
@@ -42,12 +44,10 @@ RUN apt-get install -y --no-install-recommends \
  && python3 -m spacy download "it_core_news_md-${SPACY_MODELS_VERSION}" --direct \
  && python3 -m spacy download "nl_core_news_md-${SPACY_MODELS_VERSION}" --direct \
  && python3 -m spacy download "pt_core_news_md-${SPACY_MODELS_VERSION}" --direct
-COPY nlp /usr/local/bin
-COPY spacy-nlp /usr/local/bin
 
 
-## Cleanup ##
-RUN rm -r /var/lib/apt/lists/*
+## Install Pipeline ##
+COPY nlp spacy-nlp /usr/local/bin/
 
 
 ENTRYPOINT ["nlp"]