Updated to latest s6-overlay

This commit is contained in:
Jamie Curnow
2023-02-24 18:31:46 +10:00
parent c288886fd4
commit ecbc55f318
28 changed files with 94 additions and 98 deletions

View File

@ -12,7 +12,6 @@ ENV GOPROXY=$GOPROXY \
GOPRIVATE=$GOPRIVATE \
S6_LOGGING=0 \
SUPPRESS_NO_CONFIG_WARNING=1 \
S6_FIX_ATTRS_HIDDEN=1 \
ACMESH_CONFIG_HOME=/data/.acme.sh/config \
ACMESH_HOME=/data/.acme.sh \
CERT_HOME=/data/.acme.sh/certs \
@ -35,12 +34,14 @@ RUN cd /usr \
&& curl -sL https://taskfile.dev/install.sh | sh \
&& cd /root
COPY rootfs /
COPY docker/rootfs /
RUN rm -f /etc/nginx/conf.d/production.conf
# s6 overlay
RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \
&& tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
COPY scripts/install-s6 /tmp/install-s6
RUN /tmp/install-s6 && rm -rf /tmp/*
#RUN curl -L -o /tmp/s6-overlay-amd64.tar.gz "https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz" \
# && tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /
# Fix for golang dev:
RUN chown -R 1000:1000 /opt/go