Bring up to recent v2 changes around s6

This commit is contained in:
Jamie Curnow
2023-05-11 09:58:20 +10:00
parent e7ef809b10
commit fb8ca0b02f
19 changed files with 175 additions and 62 deletions

View File

@ -18,8 +18,6 @@ ARG SENTRY_DSN
ENV BUILD_COMMIT="${BUILD_COMMIT:-dev}" \
BUILD_VERSION="${BUILD_VERSION:-0.0.0}" \
CGO_ENABLED=0 \
GO111MODULE=on \
GOPRIVATE="${GOPRIVATE:-}" \
GOPROXY="${GOPROXY:-}" \
SENTRY_DSN="${SENTRY_DSN:-}"
@ -43,19 +41,22 @@ COPY --from=pebbleca /test/certs/pebble.minica.pem /etc/ssl/certs/pebble.minica.
COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/certs/NginxProxyManager.crt
# These acmesh vars are defined in the base image
ENV SUPPRESS_NO_CONFIG_WARNING=1 \
S6_LOGGING=0 \
ACMESH_CONFIG_HOME=/data/.acme.sh/config \
ENV ACMESH_CONFIG_HOME=/data/.acme.sh/config \
ACMESH_HOME=/data/.acme.sh \
CERT_HOME=/data/.acme.sh/certs \
LE_CONFIG_HOME=/data/.acme.sh/config \
LE_WORKING_DIR=/data/.acme.sh
LE_WORKING_DIR=/data/.acme.sh \
S6_BEHAVIOUR_IF_STAGE2_FAILS=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_FIX_ATTRS_HIDDEN=1 \
S6_KILL_FINISH_MAXTIME=10000 \
S6_VERBOSITY=1
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf
# fail2ban
RUN apt-get update \
&& apt-get install -y --no-install-recommends fail2ban \
&& apt-get install -y --no-install-recommends fail2ban logrotate \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /etc/fail2ban