Use base image when building core images

main
Alexander Graf 2 years ago
parent 5e552bae69
commit 9fe452e3d1
No known key found for this signature in database
GPG Key ID: B8A9DC143E075629

@ -1,61 +1,34 @@
# First stage to build assets # syntax=docker/dockerfile-upstream:1.4.3
ARG DISTRO=alpine:3.14.5
FROM node:16-alpine3.16 as assets FROM base
COPY package.json ./
RUN set -eu \
&& npm config set update-notifier false \
&& npm install --no-fund
COPY webpack.config.js ./
COPY assets ./assets
RUN set -eu \
&& sed -i 's/#007bff/#55a5d9/' node_modules/admin-lte/build/scss/_bootstrap-variables.scss \
&& for l in ca da de:de-DE en:en-GB es:es-ES eu fr:fr-FR he hu is it:it-IT ja nb_NO:no-NB nl:nl-NL pl pt:pt-PT ru sv:sv-SE zh; do \
cp node_modules/datatables.net-plugins/i18n/${l#*:}.json assets/${l%:*}.json; \
done \
&& node_modules/.bin/webpack-cli --color
# Actual application
FROM $DISTRO
ARG VERSION
ENV TZ Etc/UTC
ARG VERSION=local
LABEL version=$VERSION LABEL version=$VERSION
# python3 shared with most images
RUN set -eu \
&& apk add --no-cache python3 py3-pip py3-wheel git bash tzdata \
&& pip3 install --upgrade pip
RUN mkdir -p /app
WORKDIR /app
COPY requirements-prod.txt requirements.txt COPY requirements-prod.txt requirements.txt
RUN set -eu \ RUN set -euxo pipefail \
&& apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \ && apk add --no-cache libressl curl postgresql-libs mariadb-connector-c \
&& pip install --no-cache-dir -r requirements.txt --only-binary=:all: --no-binary=Flask-bootstrap,PyYAML,SQLAlchemy \ && pip install --no-cache-dir -r requirements.txt --only-binary=:all: --no-binary=Flask-bootstrap,PyYAML,SQLAlchemy \
|| ( apk add --no-cache --virtual build-dep libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \ || ( apk add --no-cache --virtual build-dep libressl-dev libffi-dev python3-dev build-base postgresql-dev mariadb-connector-c-dev cargo \
&& pip install --upgrade pip \
&& pip install -r requirements.txt \ && pip install -r requirements.txt \
&& apk del --no-cache build-dep ) && apk del --no-cache build-dep )
COPY --from=assets static ./mailu/static
COPY mailu ./mailu COPY mailu ./mailu
RUN pybabel compile -d mailu/translations
COPY migrations ./migrations COPY migrations ./migrations
COPY start.py /start.py COPY start.py /start.py
COPY audit.py /audit.py COPY audit.py /audit.py
RUN pybabel compile -d mailu/translations COPY --from=assets static ./mailu/static
RUN echo $VERSION >> /version
EXPOSE 80/tcp EXPOSE 80/tcp
HEALTHCHECK CMD curl -skfLo /dev/null http://localhost/sso/login?next=ui.index
VOLUME ["/data","/dkim"] VOLUME ["/data","/dkim"]
ENV FLASK_APP mailu ENV FLASK_APP mailu
CMD /start.py CMD /start.py
HEALTHCHECK CMD curl -f -L http://localhost/sso/login?next=ui.index || exit 1
RUN echo $VERSION >> /version

@ -1,36 +1,22 @@
ARG DISTRO=alpine:3.14.5 # syntax=docker/dockerfile-upstream:1.4.3
FROM base
FROM $DISTRO
ARG VERSION ARG VERSION
ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
# python3 shared with most images RUN set -euxo pipefail \
RUN apk add --no-cache \ && apk add --no-cache dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client xapian-core dovecot-fts-xapian \
python3 py3-pip git bash py3-multidict py3-yarl tzdata \ && mkdir /var/lib/dovecot
&& pip3 install --upgrade pip
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, snappymail, roundcube
RUN pip3 install socrate==0.2.0
# Shared layer between dovecot and postfix
RUN apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev \
&& pip3 install "podop>0.2.5" \
&& apk del .build-deps
# Image specific layers under this line
RUN apk add --no-cache \
dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client xapian-core dovecot-fts-xapian \
&& mkdir /var/lib/dovecot
COPY conf /conf COPY conf /conf
COPY start.py /start.py COPY start.py /start.py
RUN echo $VERSION >> /version
EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
VOLUME ["/mail"] VOLUME ["/mail"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 110|grep "Dovecot ready."
RUN echo $VERSION >> /version

@ -1,34 +1,33 @@
ARG DISTRO=alpine:3.14.5 # syntax=docker/dockerfile-upstream:1.4.3
FROM $DISTRO
FROM base as static
COPY static /static
RUN set -euxo pipefail \
&& gzip -k9 /static/*.ico /static/*.txt \
&& chmod a+rX-w -R /static
FROM base
ARG VERSION ARG VERSION
ENV TZ Etc/UTC
LABEL version=$VERSION LABEL version=$VERSION
# python3 shared with most images
RUN apk add --no-cache \
python3 py3-pip git bash py3-multidict \
&& pip3 install --upgrade pip
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, snappymail, roundcube
RUN pip3 install socrate==0.2.0
# Image specific layers under this line # Image specific layers under this line
RUN apk add --no-cache certbot nginx nginx-mod-mail openssl curl tzdata \ RUN set -euxo pipefail \
&& pip3 install watchdog && apk add --no-cache certbot nginx nginx-mod-mail openssl curl \
&& pip3 install --no-cache-dir watchdog
COPY conf /conf COPY conf /conf
COPY static /static COPY --from=static /static /static
COPY *.py / COPY *.py /
RUN gzip -k9 /static/*.ico /static/*.txt; chmod a+rX -R /static RUN echo $VERSION >> /version
EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 10025/tcp 10143/tcp EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 10025/tcp 10143/tcp
VOLUME ["/certs"] HEALTHCHECK --start-period=60s CMD curl -skfLo /dev/null http://localhost/health
VOLUME ["/overrides"]
VOLUME ["/certs", "/overrides"]
CMD /start.py CMD /start.py
HEALTHCHECK CMD curl -k -f -L http://localhost/health || exit 1
RUN echo $VERSION >> /version

@ -1,6 +1,14 @@
# syntax=docker/dockerfile-upstream:1.4.3
# This is an idle image to dynamically replace any component if disabled. # This is an idle image to dynamically replace any component if disabled.
ARG DISTRO=alpine:3.14.5 FROM base
FROM $DISTRO
CMD sleep 1000000d ARG VERSION=local
LABEL version=$VERSION
RUN echo $VERSION >> /version
HEALTHCHECK CMD true
USER app
CMD ["/bin/bash", "-c", "sleep infinity"]

@ -1,40 +1,25 @@
ARG DISTRO=alpine:3.14.5 # syntax=docker/dockerfile-upstream:1.4.3
FROM $DISTRO FROM base
ARG VERSION
ENV TZ Etc/UTC
ARG VERSION=local
LABEL version=$VERSION LABEL version=$VERSION
# python3 shared with most images RUN set -euxo pipefail \
RUN apk add --no-cache \ && apk add --no-cache postfix postfix-pcre cyrus-sasl-login rsyslog logrotate \
python3 py3-pip git bash py3-multidict py3-yarl tzdata \ && pip install --no-cache-dir --only-binary=:all: postfix-mta-sts-resolver==1.0.1 \
&& pip3 install --upgrade pip || ( apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev py3-wheel libffi-dev \
&& pip3 install postfix-mta-sts-resolver==1.0.1 \
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, snappymail, roundcube && apk del .build-deps )
RUN pip3 install socrate==0.2.0
# Shared layer between dovecot and postfix
RUN apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev \
&& pip3 install "podop>0.2.5" \
&& apk del .build-deps
# Image specific layers under this line
# Building pycares from source requires py3-wheel and libffi-dev packages
RUN pip install --no-cache-dir --only-binary=:all: postfix-mta-sts-resolver==1.0.1 || (apk add --no-cache --virtual .build-deps gcc musl-dev python3-dev py3-wheel libffi-dev \
&& pip3 install postfix-mta-sts-resolver==1.0.1 \
&& apk del .build-deps )
RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-login rsyslog logrotate
COPY conf /conf COPY conf /conf
COPY start.py /start.py COPY start.py /start.py
RUN echo $VERSION >> /version
EXPOSE 25/tcp 10025/tcp EXPOSE 25/tcp 10025/tcp
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
VOLUME ["/queue"] VOLUME ["/queue"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD echo QUIT|nc localhost 25|grep "220 .* ESMTP Postfix"
RUN echo $VERSION >> /version

@ -1,31 +1,22 @@
ARG DISTRO=alpine:3.15 # syntax=docker/dockerfile-upstream:1.4.3
FROM $DISTRO
ARG VERSION
ENV TZ Etc/UTC
FROM base
ARG VERSION=local
LABEL version=$VERSION LABEL version=$VERSION
# python3 shared with most images RUN set -euxo pipefail \
RUN apk add --no-cache \ && apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl \
python3 py3-pip git bash py3-multidict tzdata \ && mkdir /run/rspamd
&& pip3 install --upgrade pip
# Shared layer between nginx, dovecot, postfix, postgresql, rspamd, unbound, snappymail, roundcube
RUN pip3 install socrate==0.2.0
# Image specific layers under this line
RUN apk add --no-cache rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates curl
RUN mkdir /run/rspamd
COPY conf/ /conf COPY conf/ /conf
COPY start.py /start.py COPY start.py /start.py
RUN echo $VERSION >> /version
EXPOSE 11332/tcp 11334/tcp 11335/tcp EXPOSE 11332/tcp 11334/tcp 11335/tcp
HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost:11334/
VOLUME ["/var/lib/rspamd"] VOLUME ["/var/lib/rspamd"]
CMD /start.py CMD /start.py
HEALTHCHECK --start-period=350s CMD curl -f -L http://localhost:11334/ || exit 1
RUN echo $VERSION >> /version

@ -78,6 +78,19 @@ function "tag" {
# docker buildx bake -f tests\build.hcl docs # docker buildx bake -f tests\build.hcl docs
#----------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------
# -----------------------------------------------------------------------------------------
# Base images
# -----------------------------------------------------------------------------------------
target "base" {
inherits = ["defaults"]
context="core/base"
}
target "assets" {
inherits = ["defaults"]
context="core/admin/assets"
}
# ----------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------
# Documentation and setup images # Documentation and setup images
# ----------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------
@ -103,36 +116,55 @@ target "setup" {
target "none" { target "none" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/none" context="core/none"
contexts= {
base = "target:base"
}
tags = tag("none") tags = tag("none")
} }
target "admin" { target "admin" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/admin" context="core/admin"
contexts= {
base = "target:base"
assets = "target:assets"
}
tags = tag("admin") tags = tag("admin")
} }
target "antispam" { target "antispam" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/rspamd" context="core/rspamd"
contexts= {
base = "target:base"
}
tags = tag("rspamd") tags = tag("rspamd")
} }
target "front" { target "front" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/nginx" context="core/nginx"
contexts= {
base = "target:base"
}
tags = tag("nginx") tags = tag("nginx")
} }
target "imap" { target "imap" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/dovecot" context="core/dovecot"
contexts= {
base = "target:base"
}
tags = tag("dovecot") tags = tag("dovecot")
} }
target "smtp" { target "smtp" {
inherits = ["defaults"] inherits = ["defaults"]
context="core/postfix" context="core/postfix"
contexts= {
base = "target:base"
}
tags = tag("postfix") tags = tag("postfix")
} }

Loading…
Cancel
Save