From 5c9ff90d288e48d0cec78f6446fcc904df72da16 Mon Sep 17 00:00:00 2001 From: Manoel Brunnen Date: Sun, 3 Feb 2019 12:10:51 +0100 Subject: [PATCH 1/2] Fix libssl-dev dependency installation The apt package informations have already been removed at this point. Also, this dependency is not armhf specific. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9448ab895e..d86097fb09 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,6 +47,7 @@ apt-get install -y --no-install-recommends \ supervisor \ tesseract-ocr \ zlib1g-dev \ + libssl-dev \ && \ apt-get clean autoclean && \ apt-get autoremove --purge -y && \ @@ -67,7 +68,6 @@ ln -s /usr/lib/aarch64-linux-gnu/libjpeg.so /usr/lib/ \ # Pillow can't find zlib or libjpeg on armv7l (ODROID HC1) RUN if [ "$(uname -m)" = "armv7l" ]; then \ -apt-get install libssl-dev -y && \ ln -s /usr/lib/arm-linux-gnueabihf/libz.so /usr/lib/ && \ ln -s /usr/lib/arm-linux-gnueabihf/libjpeg.so /usr/lib/ \ ; fi From c4b9ae596ee7494442e44e61e39b91dca42fd703 Mon Sep 17 00:00:00 2001 From: Manoel Brunnen Date: Sun, 3 Feb 2019 23:14:07 +0100 Subject: [PATCH 2/2] Workaround for pip bug #6179 See https://github.com/pypa/pip/issues/6197 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d86097fb09..44ea750f25 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -131,11 +131,11 @@ COPY --from=BUILDER_IMAGE /code/docker/version . RUN chown -R mayan:mayan $PROJECT_INSTALL_DIR # Install build Mayan EDMS -RUN sudo -u mayan $PYTHON_PIP install --no-cache-dir *.whl && \ +RUN sudo -u mayan $PYTHON_PIP install --no-cache-dir --no-use-pep517 *.whl && \ rm *.whl # Install Python clients for librabbitmq, MySQL, PostgreSQL, REDIS -RUN sudo -u mayan $PYTHON_PIP install --no-cache-dir librabbitmq==1.6.1 mysql-python==1.2.5 psycopg2==2.7.3.2 redis==2.10.6 +RUN sudo -u mayan $PYTHON_PIP install --no-cache-dir --no-use-pep517 librabbitmq==1.6.1 mysql-python==1.2.5 psycopg2==2.7.3.2 redis==2.10.6 # Setup supervisor COPY docker/etc/supervisor/mayan.conf /etc/supervisor/conf.d