Merge pull request #161 from dainst/python3

Python3 und Pipenv Fixes. Wir sollten das ändern, sobald man wieder die neueste pipenv version verwenden kann.
dainst · Jun 16, 2020 · 422b9b9 · 422b9b9
2 parents 5ff4185 + a8faf1b
commit 422b9b9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docker/cilantro-convert-worker/Dockerfile b/docker/cilantro-convert-worker/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
     libtiff-dev \
     libpoppler-cpp-dev \
     pkg-config \
-    python-dev \
+    python3-dev \
     libmagickwand-dev \
     ghostscript \
     tesseract-ocr \
@@ -23,7 +23,7 @@ ENV LANG C.UTF-8
 # workaround for pipenv bug: https://github.com/pypa/pipenv/issues/1328
 RUN set -ex && mkdir /app
 
-RUN pip3 install pipenv
+RUN pip3 install 'pipenv==2018.11.26'
 COPY docker/cilantro-convert-worker/Pipfile.lock Pipfile.lock
 COPY docker/cilantro-convert-worker/Pipfile Pipfile
 RUN set -ex && pipenv install --deploy --system

diff --git a/docker/cilantro-default-worker/Dockerfile b/docker/cilantro-default-worker/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update && \
     build-essential \
     libpoppler-cpp-dev \
     pkg-config \
-    python-dev \
+    python3-dev \
     libmagickwand-dev \
     ghostscript
 
@@ -20,7 +20,7 @@ ENV LANG C.UTF-8
 RUN set -ex && mkdir /app
 
 
-RUN pip3 install pipenv
+RUN pip3 install 'pipenv==2018.11.26'
 COPY docker/cilantro-default-worker/Pipfile.lock Pipfile.lock
 COPY docker/cilantro-default-worker/Pipfile Pipfile
 RUN set -ex && pipenv install --deploy --system

diff --git a/docker/cilantro-nlp-heideltime-worker/Dockerfile b/docker/cilantro-nlp-heideltime-worker/Dockerfile
@@ -17,7 +17,7 @@ ENV LANG C.UTF-8
 # workaround for pipenv bug: https://github.com/pypa/pipenv/issues/1328
 RUN set -ex && mkdir /app
 
-RUN pip3 install pipenv
+RUN pip3 install 'pipenv==2018.11.26'
 COPY docker/cilantro-nlp-heideltime-worker/Pipfile.lock Pipfile.lock
 COPY docker/cilantro-nlp-heideltime-worker/Pipfile Pipfile
 RUN set -ex && pipenv install --deploy --system

diff --git a/docker/cilantro-service/Dockerfile b/docker/cilantro-service/Dockerfile
@@ -5,12 +5,12 @@ ENV PIPENV_VENV_IN_PROJECT=true
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
-RUN apk add --update python-dev py-pip gcc libffi libffi-dev musl-dev
+RUN apk add --update python3-dev py-pip gcc libffi libffi-dev musl-dev
 
 # workaround for pipenv bug: https://github.com/pypa/pipenv/issues/1328
 RUN set -ex && mkdir /app
 
-RUN pip3 install pipenv
+RUN pip3 install 'pipenv==2018.11.26'
 COPY docker/cilantro-service/Pipfile.lock Pipfile.lock
 COPY docker/cilantro-service/Pipfile Pipfile
 RUN set -ex && pipenv install --deploy --system

diff --git a/docker/cilantro-test/Dockerfile b/docker/cilantro-test/Dockerfile
@@ -22,7 +22,7 @@ ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
 
-RUN pip3 install pipenv
+RUN pip3 install 'pipenv==2018.11.26'
 COPY docker/cilantro-test/Pipfile.lock Pipfile.lock
 COPY docker/cilantro-test/Pipfile Pipfile
 RUN set -ex && pipenv install --deploy --system