From 22fc16f4a3fc3a5811e201b1fad16dc22fad20c5 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Sun, 10 Jan 2021 17:18:35 +0100 Subject: [PATCH] revert to python:3.7-slim base image since ubuntu:20.04 is clearly not working for arm --- Dockerfile | 21 ++++---------- requirements.txt | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 15 deletions(-) create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile index d124ddc09..ee19e0cc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,15 +19,15 @@ RUN npm install COPY src-ui . RUN node_modules/.bin/ng build --prod --output-hashing none --sourceMap=false -FROM ubuntu:20.04 +FROM python:3.7-slim WORKDIR /usr/src/paperless/ -COPY Pipfile* ./ +COPY requirements.txt ./ #Dependencies RUN apt-get update \ - && DEBIAN_FRONTEND="noninteractive" apt-get -y --no-install-recommends install \ + && apt-get -y --no-install-recommends install \ build-essential \ curl \ file \ @@ -38,21 +38,16 @@ RUN apt-get update \ icc-profiles-free \ imagemagick \ libatlas-base-dev \ - libffi-dev \ liblept5 \ libmagic-dev \ libpoppler-cpp-dev \ libpq-dev \ libqpdf-dev \ - libssl-dev \ libxml2 \ libxslt1-dev \ mime-support \ optipng \ pngquant \ - python3 \ - python3-pip \ - python3-dev \ qpdf \ sudo \ tesseract-ocr \ @@ -64,13 +59,9 @@ RUN apt-get update \ tzdata \ unpaper \ zlib1g \ - - && pip3 install --upgrade supervisor pipenv setuptools \ - && pipenv lock -r > requirements.txt \ - && pip3 install -r requirements.txt \ - && pipenv --clear \ - && pip3 uninstall -y pipenv \ - && apt-get -y purge build-essential libqpdf-dev python3-dev python3-pip \ + && pip3 install --upgrade supervisor \ + && python3 -m pip install -r requirements.txt \ + && apt-get -y purge build-essential libqpdf-dev \ && apt-get -y autoremove --purge \ && rm -rf /var/lib/apt/lists/* \ && mkdir /var/log/supervisord /var/run/supervisord diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..9932d146b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,74 @@ +# +# These requirements were autogenerated by pipenv +# To regenerate from the project's Pipfile, run: +# +# pipenv lock --requirements +# + +-i https://pypi.python.org/simple +--extra-index-url https://www.piwheels.org/simple +arrow==0.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +asgiref==3.3.1; python_version >= '3.5' +blessed==1.17.12 +certifi==2020.12.5 +cffi==1.14.4 +chardet==4.0.0; python_version >= '3.1' +coloredlogs==15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +cryptography==3.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' +dateparser==0.7.6 +django-cors-headers==3.6.0 +django-extensions==3.1.0 +django-filter==2.4.0 +django-picklefield==3.0.1; python_version >= '3' +django-q==1.3.4 +django==3.1.5 +djangorestframework==3.12.2 +filelock==3.0.12 +fuzzywuzzy==0.18.0 +gunicorn==20.0.4 +humanfriendly==9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +idna==2.10; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +imap-tools==0.34.0 +img2pdf==0.4.0 +importlib-metadata==3.3.0; python_version < '3.8' +inotify-simple==1.3.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +inotifyrecursive==0.3.5 +joblib==1.0.0; python_version >= '3.6' +langdetect==1.0.8 +lxml==4.6.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +numpy==1.19.5; python_version >= '3.6' +ocrmypdf==11.4.5 +pathvalidate==2.3.2 +pdfminer.six==20201018; python_version >= '3.4' +pdftotext==2.1.5 +pikepdf==2.2.5 +pillow==8.1.0 +pluggy==0.13.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +psycopg2-binary==2.8.6 +pycparser==2.20; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +python-dateutil==2.8.1 +python-dotenv==0.15.0 +python-gnupg==0.4.6 +python-levenshtein==0.12.0 +python-magic==0.4.18 +pytz==2020.5 +redis==3.5.3 +regex==2020.11.13 +reportlab==3.5.59 +requests==2.25.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +scikit-learn==0.23.2 +scipy==1.5.4; python_version >= '3.6' +six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +sortedcontainers==2.3.0 +sqlparse==0.4.1; python_version >= '3.5' +threadpoolctl==2.1.0; python_version >= '3.5' +tika==1.24 +tqdm==4.55.1 +typing-extensions==3.7.4.3; python_version < '3.8' +tzlocal==2.1 +urllib3==1.26.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' +watchdog==1.0.2 +wcwidth==0.2.5 +whitenoise==5.2.0 +whoosh==2.7.4 +zipp==3.4.0; python_version >= '3.6'