Updated to latest s6-overlay

Author: jc21

docker/Dockerfile

@@ -44,7 +44,7 @@ COPY --from=testca /home/step/certs/root_ca.crt /etc/ssl/certs/NginxProxyManager
 
 # These acmesh vars are defined in the base image
 ENV SUPPRESS_NO_CONFIG_WARNING=1 \
-	S6_FIX_ATTRS_HIDDEN=1 \
+	S6_LOGGING=0 \
 	ACMESH_CONFIG_HOME=/data/.acme.sh/config \
 	ACMESH_HOME=/data/.acme.sh \
 	CERT_HOME=/data/.acme.sh/certs \

docker/dev/Dockerfile

@@ -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

docker/rootfs/etc/cont-finish.d/.gitignore

@@ -1,9 +1,7 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
+set -e
 
-RESET='\E[0m'
-YELLOW='\E[1;33m'
-
-echo -e "${YELLOW}Starting backend API ...${RESET}"
+echo "❯ Starting backend ..."
 
 if [ "$DEVELOPMENT" == "true" ]; then
 	HOME=/tmp/npmuserhome
@@ -13,12 +11,8 @@ if [ "$DEVELOPMENT" == "true" ]; then
 	export HOME GOPATH
 	rm -rf /app/backend/.task
 	cd /app/backend || exit 1
-	s6-setuidgid npmuser task -w
+	exec s6-setuidgid npmuser task -w
 else
 	cd /app/bin || exit 1
-	while :
-	do
-		s6-setuidgid npmuser /app/bin/server
-		sleep 1
-	done
+	exec s6-setuidgid npmuser /app/bin/server
 fi

docker/rootfs/etc/cont-init.d/10-nginx

@@ -0,0 +1 @@
+longrun