Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python3 und Pipenv Fixes #161

Merged
merged 2 commits into from
Jun 16, 2020
Merged

Python3 und Pipenv Fixes #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3a5566
Switch to python3-dev
ngrippa Jun 9, 2020
a8faf1b
Install specified version of pipenv
ngrippa Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/cilantro-convert-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN apt-get update && \
libtiff-dev \
libpoppler-cpp-dev \
pkg-config \
python-dev \
python3-dev \
libmagickwand-dev \
ghostscript \
tesseract-ocr \
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cilantro-default-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get update && \
build-essential \
libpoppler-cpp-dev \
pkg-config \
python-dev \
python3-dev \
libmagickwand-dev \
ghostscript

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/cilantro-nlp-heideltime-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cilantro-service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/cilantro-test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down