matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

As many RUN squashed as possible.

Browse Source 
Image size down to 1.15GB, 14 layers.
Files and scripts move to a docker root fs instead of copied.
Debian slim 9.8.
Updated to Docker best practices.

Signed-off-by: Anderson Santiago <SantiagoGitlab@gmail.com>
This commit is contained in:
Santiago
2019-05-09 20:30:48 +00:00
committed by Roberto Rosario
parent f5aaff9ab1
commit f55979b1a6
8 changed files with 154 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.dockerignore
View File

@@ -4,8 +4,7 @@ HISTORY.md
mayan/media mayan/media
db.sqlite* db.sqlite*
docker docker
!docker/etc !docker/rootfs
!docker/entrypoint.sh
!docker/version
./.* ./.*
docs docs

4
contrib/scripts/docker/run-tests.sh
View File

@@ -1,8 +1,10 @@
#!/bin/sh #!/bin/sh
export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install -y --no-install-recommends tesseract-ocr-deu apt-get install -y --no-install-recommends tesseract-ocr-deu
$MAYAN_PIP_BIN install -r $DOCKER_ROOT/requirements-testing.txt $MAYAN_PIP_BIN install -r ${MAYAN_INSTALL_DIR}/requirements-testing.txt
$MAYAN_BIN test --mayan-apps --settings=mayan.settings.testing $MAYAN_BIN test --mayan-apps --settings=mayan.settings.testing

247
docker/Dockerfile
View File

@@ -1,167 +1,150 @@
# vim:set ft=dockerfile: # vim:set ft=dockerfile:
#################### ####
# Base image start # # BASE_IMAGE - Bare bones image with the base packages needed to run Mayan EDMS
#################### ####
FROM debian:9.4-slim as BASE_IMAGE FROM debian:9.8-slim as BASE_IMAGE
MAINTAINER Roberto Rosario "roberto.rosario@mayan-edms.com" LABEL maintainer="Roberto Rosario roberto.rosario@mayan-edms.com"
ENV DEBIAN_FRONTEND noninteractive ENV PYTHONUNBUFFERED=1 \
ENV PYTHONUNBUFFERED 1 LC_ALL=C.UTF-8 \
ENV LC_ALL C.UTF-8 PROJECT_INSTALL_DIR=/opt/mayan-edms
ENV PROJECT_INSTALL_DIR=/opt/mayan-edms
ENV PYTHON_PIP=${PROJECT_INSTALL_DIR}/bin/pip
# Debian package caching
ARG APT_PROXY ARG APT_PROXY
# Package caching RUN set -x \
RUN if [ "${APT_PROXY}" ]; then echo "Acquire::http { Proxy \"http://${APT_PROXY}\"; };" > /etc/apt/apt.conf.d/01proxy; fi && if [ "${APT_PROXY}" ]; \
then echo "Acquire::http { Proxy \"http://${APT_PROXY}\"; };" > /etc/apt/apt.conf.d/01proxy \
# Install base Ubuntu libraries ; fi \
RUN apt-get update && \ # Install base OS packages to run Mayan EDMS
apt-get install -y --no-install-recommends \ && DEBIAN_FRONTEND=noninteractive \
g++ \ apt-get update \
gcc \ && apt-get install -y --no-install-recommends \
ghostscript \ exiftool \
gpgv \ ghostscript \
gnupg1 \ gpgv \
graphviz \ gnupg1 \
libffi-dev \ graphviz \
libfuse2 \ libfuse2 \
libjpeg-dev \ libmagic1 \
libmagic1 \ libmariadbclient18 \
default-libmysqlclient-dev \ libreoffice \
libpng-dev \ libpq5 \
libpq-dev \ poppler-utils \
libreoffice \ redis-server \
libtiff-dev \ sane-utils \
poppler-utils \ sudo \
python-dev \ supervisor \
python-setuptools \ tesseract-ocr \
python-virtualenv \ # Add mayan user
python-wheel \ && adduser mayan --disabled-password --disabled-login --no-create-home --gecos "" \
redis-server \
sane-utils \
sudo \
supervisor \
tesseract-ocr \
zlib1g-dev \
libssl-dev \
&& \
apt-get clean autoclean && \
apt-get autoremove --purge -y && \
rm -rf /var/lib/apt/lists/* && \
rm -f /var/cache/apt/archives/*.deb
# Install apt-get-install
ADD https://raw.githubusercontent.com/guilhem/apt-get-install/master/apt-get-install /usr/bin/
RUN chmod +x /usr/bin/apt-get-install
RUN adduser mayan --disabled-password --disabled-login --no-create-home --gecos ""
# Pillow can't find zlib or libjpeg on aarch64 (ODROID C2) # Pillow can't find zlib or libjpeg on aarch64 (ODROID C2)
RUN if [ "$(uname -m)" = "aarch64" ]; then \ && if [ "$(uname -m)" = "aarch64" ]; then \
ln -s /usr/lib/aarch64-linux-gnu/libz.so /usr/lib/ && \ ln -s /usr/lib/aarch64-linux-gnu/libz.so /usr/lib/ \
ln -s /usr/lib/aarch64-linux-gnu/libjpeg.so /usr/lib/ \ && ln -s /usr/lib/aarch64-linux-gnu/libjpeg.so /usr/lib/ \
; fi ; fi \
# Pillow can't find zlib or libjpeg on armv7l (ODROID HC1) # Pillow can't find zlib or libjpeg on armv7l (ODROID HC1)
RUN if [ "$(uname -m)" = "armv7l" ]; then \ && if [ "$(uname -m)" = "armv7l" ]; then \
ln -s /usr/lib/arm-linux-gnueabihf/libz.so /usr/lib/ && \ ln -s /usr/lib/arm-linux-gnueabihf/libz.so /usr/lib/ \
ln -s /usr/lib/arm-linux-gnueabihf/libjpeg.so /usr/lib/ \ && ln -s /usr/lib/arm-linux-gnueabihf/libjpeg.so /usr/lib/ \
; fi ; fi \
# Discard data when Redis runs out of memory # Discard data when Redis runs out of memory
RUN echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf && echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf \
# Disable saving the Redis database # Disable saving the Redis database
RUN echo "save \"\"" >> /etc/redis/redis.conf echo "save \"\"" >> /etc/redis/redis.conf \
# Only provision 1 database # Only provision 1 database
RUN echo "databases 1" >> /etc/redis/redis.conf && echo "databases 1" >> /etc/redis/redis.conf
#####################
# Build image start #
#####################
FROM debian:9.4-slim as BUILDER_IMAGE ####
# BUILDER_IMAGE - This image buildS the Python package and is discarded afterwards
####
ARG APT_PROXY # Reuse image
# Package caching FROM BASE_IMAGE as BUILDER_IMAGE
RUN if [ "${APT_PROXY}" ]; then echo "Acquire::http { Proxy \"http://${APT_PROXY}\"; };" > /etc/apt/apt.conf.d/01proxy; fi
WORKDIR /code WORKDIR /src
COPY . /code # Copy the source files needed to build the Python package
COPY --chown=mayan:mayan requirements /src/requirements
COPY --chown=mayan:mayan \
HISTORY.rst \
LICENSE \
MANIFEST.in \
README.md \
README.rst \
setup.py \
Makefile \
/src/
RUN apt-get update && apt-get install make python-dev python-pip -y COPY --chown=mayan:mayan mayan /src/mayan
RUN pip install -r requirements/build.txt # Install development packages needed to build the Python packages
RUN DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
default-libmysqlclient-dev \
libffi-dev \
libjpeg-dev \
libpng-dev \
libpq-dev \
libtiff-dev \
make \
python-wheel \
zlib1g-dev \
libssl-dev \
g++ \
gcc \
python-dev \
python-setuptools \
python-virtualenv \
&& mkdir -p "${PROJECT_INSTALL_DIR}" \
&& chown -R mayan:mayan "${PROJECT_INSTALL_DIR}" \
&& chown -R mayan:mayan /src
ENV LC_ALL C.UTF-8 USER mayan
RUN python -m virtualenv "${PROJECT_INSTALL_DIR}" \
&& . "${PROJECT_INSTALL_DIR}/bin/activate" \
&& 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 \
# Install the Python packages needed to build Mayan EDMS
&& pip install --no-cache-dir --no-use-pep517 -r /src/requirements/build.txt \
# Build Mayan EDMS
&& make python-wheel \
# Install the built Mayan EDMS package
&& pip install --no-cache-dir --no-use-pep517 dist/*.whl \
# Install the static content
&& mayan-edms.py installjavascript \
&& MAYAN_STATIC_ROOT=${PROJECT_INSTALL_DIR}/static mayan-edms.py preparestatic --link --noinput
RUN touch docker/Makefile COPY --chown=mayan:mayan requirements/testing-base.txt "${PROJECT_INSTALL_DIR}"
RUN make python-wheel ####
# Final image - BASE_IMAGE + Mayan install directory from the builder image
RUN chmod 777 dist -R ####
#####################
# Final image start #
#####################
FROM BASE_IMAGE FROM BASE_IMAGE
RUN mkdir -p /opt COPY --from=BUILDER_IMAGE --chown=mayan:mayan "${PROJECT_INSTALL_DIR}/" "${PROJECT_INSTALL_DIR}/"
RUN python /usr/lib/python2.7/dist-packages/virtualenv.py $PROJECT_INSTALL_DIR USER root
WORKDIR $PROJECT_INSTALL_DIR COPY docker/rootfs /
COPY --from=BUILDER_IMAGE /code/dist/*.whl .
COPY --from=BUILDER_IMAGE /code/contrib/scripts/docker/run-tests.sh .
COPY --from=BUILDER_IMAGE /code/requirements/testing-base.txt requirements-testing.txt
COPY --from=BUILDER_IMAGE /code/docker/version .
# Fix ownership
RUN chown -R mayan:mayan $PROJECT_INSTALL_DIR
# Install build Mayan EDMS
RUN sudo -u mayan $PYTHON_PIP install --no-cache-dir --no-use-pep517 *.whl && \
rm *.whl && \
mayan-edms.py installjavascript && \
MAYAN_STATIC_ROOT=${PROJECT_INSTALL_DIR}/static mayan-edms.py preparestatic --link --noinput
# Install Python clients for librabbitmq, MySQL, PostgreSQL, REDIS
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
RUN mkdir /var/lib/mayan
VOLUME ["/var/lib/mayan"] VOLUME ["/var/lib/mayan"]
COPY docker/entrypoint.sh /usr/local/bin/
RUN ln -s usr/local/bin/entrypoint.sh / # backwards compat
ENTRYPOINT ["entrypoint.sh"] ENTRYPOINT ["entrypoint.sh"]
EXPOSE 8000 EXPOSE 8000
CMD ["mayan"] CMD ["mayan"]
RUN rm /root/.cache -R RUN apt-get clean autoclean \
RUN rm -rf /tmp/* && apt-get autoremove --purge -y \
&& rm -rf /var/lib/apt/lists/* \
RUN apt-get -y autoremove --purge && apt-get -y autoclean && apt-get -y clean && rm -f /var/cache/apt/archives/*.deb \
# Keep displaying log messages to stdout
RUN rm -rf /usr/share/man/* && find /var/log -type f | while read f; do echo -ne '' > $f; done;
RUN rm -rf /usr/share/doc/*
RUN find /var/lib/apt -type f | xargs rm -f
RUN find /var/cache -type f -exec rm -rf {} \;
RUN find /var/log -type f | while read f; do echo -ne '' > $f; done;

2
docker/Makefile
View File

@@ -1,5 +1,5 @@
APT_PROXY ?= `/sbin/ip route|awk '/docker0/ { print $$9 }'`:3142 APT_PROXY ?= `/sbin/ip route|awk '/docker0/ { print $$9 }'`:3142
IMAGE_VERSION ?= `cat docker/version` IMAGE_VERSION ?= `cat docker/rootfs/version`
CONSOLE_COLUMNS ?= `echo $$(tput cols)` CONSOLE_COLUMNS ?= `echo $$(tput cols)`
CONSOLE_LINES ?= `echo $$(tput lines)` CONSOLE_LINES ?= `echo $$(tput lines)`

0
docker/etc/supervisor/mayan.conf → docker/rootfs/etc/supervisor/conf.d/mayan.conf
View File

40
docker/entrypoint.sh → docker/rootfs/usr/local/bin/entrypoint.sh
View File

@@ -4,7 +4,6 @@ set -e
echo "mayan: starting entrypoint.sh" echo "mayan: starting entrypoint.sh"
INSTALL_FLAG=/var/lib/mayan/system/SECRET_KEY INSTALL_FLAG=/var/lib/mayan/system/SECRET_KEY
CONCURRENCY_ARGUMENT=--concurrency= CONCURRENCY_ARGUMENT=--concurrency=
export DOCKER_ROOT=/opt/mayan-edms
export MAYAN_DEFAULT_BROKER_URL=redis://127.0.0.1:6379/0 export MAYAN_DEFAULT_BROKER_URL=redis://127.0.0.1:6379/0
export MAYAN_DEFAULT_CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0 export MAYAN_DEFAULT_CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
@@ -53,14 +52,30 @@ export PYTHONPATH=$PYTHONPATH:$MAYAN_MEDIA_ROOT
chown mayan:mayan /var/lib/mayan -R chown mayan:mayan /var/lib/mayan -R
apt_get_install() {
apt-get -q update
apt-get install -y --force-yes --no-install-recommends --auto-remove "$@"
apt-get -q clean
rm -rf /var/lib/apt/lists/*
}
initialize() { initialize() {
echo "mayan: initialize()" echo "mayan: initialize()"
su mayan -c "${MAYAN_BIN} initialsetup --force --no-javascript" su mayan -c "${MAYAN_BIN} initialsetup --force --no-javascript"
} }
upgrade() { os_package_installs() {
echo "mayan: upgrade()" echo "mayan: os_package_installs()"
su mayan -c "${MAYAN_BIN} performupgrade --no-javascript" if [ "${MAYAN_APT_INSTALLS}" ]; then
DEBIAN_FRONTEND=noninteractive apt_get_install $MAYAN_APT_INSTALLS
fi
}
pip_installs() {
echo "mayan: pip_installs()"
if [ "${MAYAN_PIP_INSTALLS}" ]; then
su mayan -c "${MAYAN_PIP_BIN} install $MAYAN_PIP_INSTALLS"
fi
} }
start() { start() {
@@ -69,18 +84,9 @@ start() {
exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf
} }
os_package_installs() { upgrade() {
echo "mayan: os_package_installs()" echo "mayan: upgrade()"
if [ "${MAYAN_APT_INSTALLS}" ]; then su mayan -c "${MAYAN_BIN} performupgrade --no-javascript"
apt-get-install $MAYAN_APT_INSTALLS
fi
}
pip_installs() {
echo "mayan: pip_installs()"
if [ "${MAYAN_PIP_INSTALLS}" ]; then
$MAYAN_PIP_BIN install $MAYAN_PIP_INSTALLS
fi
} }
os_package_installs || true os_package_installs || true
@@ -105,7 +111,7 @@ run-tests) # Check if this is a new install, otherwise try to upgrade the existi
else else
upgrade upgrade
fi fi
$DOCKER_ROOT/run-tests.sh run-tests.sh
;; ;;
*) su mayan -c "$@"; *) su mayan -c "$@";

10
docker/rootfs/usr/local/bin/run-tests.sh Executable file
View File

@@ -0,0 +1,10 @@
#!/bin/sh
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y --no-install-recommends tesseract-ocr-deu
$MAYAN_PIP_BIN install -r ${MAYAN_INSTALL_DIR}/testing-base.txt
$MAYAN_BIN test --mayan-apps --settings=mayan.settings.testing

0
docker/version → docker/rootfs/version
View File