diff --git a/Stable2.0/Dockerfile b/Stable2.0/Dockerfile index 8e99652..ba38408 100644 --- a/Stable2.0/Dockerfile +++ b/Stable2.0/Dockerfile @@ -6,6 +6,10 @@ ARG VERSION ARG COMMIT ARG BRANCH ARG DATE +ARG DEBIAN_FRONTEND=noninteractive + +# Set apt non-interactive +ENV DEBIAN_FRONTEND=noninteractive LABEL org.label-schema.name="Rspamd" \ org.label-schema.description="Rspamd Spam Filter - STABLE" \ @@ -13,18 +17,26 @@ LABEL org.label-schema.name="Rspamd" \ org.label-schema.url="https://rspamd.com" \ org.label-schema.vendor="gnilebein" \ org.label-schema.schema-version="1.0" \ - org.label-schema.version=$VERSION \ - org.label-schema.vcs-url="https://github.com/rspamd/rspamd/" \ - org.label-schema.vcs-ref=$COMMIT \ + org.label-schema.version=$VERSION \ + org.label-schema.vcs-url="https://github.com/rspamd/rspamd/" \ + org.label-schema.vcs-ref=$COMMIT \ org.label-schema.build-date=$DATE -# Set apt non-interactive -ENV DEBIAN_FRONTEND=noninteractive - # Install Rspamd RUN set -x \ && apt update \ - && apt --no-install-recommends install -y apt-transport-https dnsutils netcat-traditional lsb-release wget gnupg openssl ca-certificates nano less \ + && apt --no-install-recommends install -y \ + apt-transport-https \ + dnsutils \ + netcat-traditional \ + lsb-release \ + wget \ + gnupg \ + openssl \ + ca-certificates \ + nano \ + less \ + ca-certificates \ && DEBIAN_CODE_NAME=`lsb_release -c -s` \ && wget -O - https://rspamd.com/apt-stable/gpg.key | apt-key add - \ && echo "deb http://rspamd.com/apt-stable/ $DEBIAN_CODE_NAME main" > /etc/apt/sources.list.d/rspamd.list \ @@ -59,7 +71,7 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=10s \ CMD /usr/bin/rspamadm control stat || exit 1 # Run Rspamd -ENTRYPOINT ["/docker-entrypoint.sh"] +ENTRYPOINT ["bash", "/docker-entrypoint.sh"] STOPSIGNAL SIGTERM