diff --git a/docker/Dockerfile b/docker/Dockerfile index 04808e2f37..0adc4f291b 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,14 +31,13 @@ apt-get update \ graphviz \ libfuse2 \ libmagic1 \ - libmariadb3 \ + libmariadbclient-dev \ libreoffice \ libpq5 \ poppler-utils \ redis-server \ sane-utils \ sudo \ - sed \ supervisor \ tesseract-ocr \ # Remove make and build dependencies @@ -85,8 +84,6 @@ COPY --chown=mayan:mayan \ COPY --chown=mayan:mayan mayan /src/mayan -RUN sed '/st_mysql_options options;/a unsigned int reconnect;' /usr/include/mariadb/mysql/mysql.h -i.bkp - # Install development packages needed to build the Python packages RUN DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ @@ -129,11 +126,8 @@ RUN python -m virtualenv "${PROJECT_INSTALL_DIR}" \ && mayan-edms.py installjavascript \ && MAYAN_STATIC_ROOT=${PROJECT_INSTALL_DIR}/static mayan-edms.py preparestatic --link --noinput -RUN apt install -y tesseract-ocr-deu - COPY --chown=mayan:mayan requirements/testing-base.txt "${PROJECT_INSTALL_DIR}" - #### # Final image - BASE_IMAGE + Mayan install directory from the builder image #### @@ -153,7 +147,6 @@ ENTRYPOINT ["entrypoint.sh"] EXPOSE 8000 CMD ["mayan"] - RUN ${PROJECT_INSTALL_DIR}/bin/mayan-edms.py platformtemplate supervisord_docker > /etc/supervisor/conf.d/mayan.conf \ && apt-get clean autoclean \ && apt-get autoremove --purge -y \