From c49da3b50ada90e858cc9cfecdc4f83a6e31d2bf Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Mon, 29 Oct 2018 10:49:19 +0100
Subject: [PATCH] Update

---
 Dockerfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 83fb254..9dfbe48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,6 @@ MAINTAINER Patrick Jentsch <p.jentsch@uni-bielefeld.de>
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LANG=C.UTF-8
-ENV PYFLOW_VERSION 1.1.20
-ENV OCROPY_VERSION 1.3.3
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -23,7 +21,19 @@ RUN apt-get update && \
 
 WORKDIR /root
 
+# Install ocropy
+ENV OCROPY_VERSION 1.3.3
+RUN wget -nv https://github.com/tmbdev/ocropy/archive/v"$OCROPY_VERSION".tar.gz && \
+    tar -xzf v"$OCROPY_VERSION".tar.gz && \
+    rm v"$OCROPY_VERSION".tar.gz && \
+    cd ocropy-"$OCROPY_VERSION" && \
+    apt-get install -y --no-install-recommends $(cat PACKAGES) python-pil python-tk && \
+    wget -nv http://www.tmbdev.net/en-default.pyrnn.gz -P models/ && \
+    python2.7 setup.py install && \
+    cd ..
+
 # Install pyFlow
+ENV PYFLOW_VERSION 1.1.20
 RUN wget -nv https://github.com/Illumina/pyflow/releases/download/v"$PYFLOW_VERSION"/pyflow-"$PYFLOW_VERSION".tar.gz && \
     tar -xzf pyflow-"$PYFLOW_VERSION".tar.gz && \
     rm pyflow-"$PYFLOW_VERSION".tar.gz && \
@@ -43,16 +53,6 @@ RUN echo "deb https://notesalexp.org/tesseract-ocr/stretch/ stretch main" >> /et
     wget -nv https://github.com/tesseract-ocr/tessdata_best/raw/master/fra.traineddata -P /usr/share/tesseract-ocr/4.00/tessdata && \
     wget -nv https://github.com/tesseract-ocr/tessdata_best/raw/master/frm.traineddata -P /usr/share/tesseract-ocr/4.00/tessdata
 
-# Install ocropy
-RUN wget -nv https://github.com/tmbdev/ocropy/archive/v"$OCROPY_VERSION".tar.gz && \
-    tar -xzf v"$OCROPY_VERSION".tar.gz && \
-    rm v"$OCROPY_VERSION".tar.gz && \
-    cd ocropy-"$OCROPY_VERSION" && \
-    apt-get install -y --no-install-recommends $(cat PACKAGES) python-pil python-tk && \
-    wget -nv http://www.tmbdev.net/en-default.pyrnn.gz -P models/ && \
-    python2.7 setup.py install && \
-    cd ..
-
 COPY ocr_pyflow /usr/local/bin
 COPY parse_hocr /usr/local/bin