Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
parent
a7c7be01c1
commit
8619de0031
|
@ -9,7 +9,7 @@ ENV S6_OVERLAY_VERSION v3.1.1.2
|
||||||
COPY ./scripts/install.sh /usr/local/bin/install.sh
|
COPY ./scripts/install.sh /usr/local/bin/install.sh
|
||||||
ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh
|
ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh
|
||||||
|
|
||||||
ENTRYPOINT [ "/init" ]
|
ENTRYPOINT [ "/s6-init" ]
|
||||||
|
|
||||||
COPY s6/debian-root /
|
COPY s6/debian-root /
|
||||||
COPY s6/service /usr/local/bin/service
|
COPY s6/service /usr/local/bin/service
|
||||||
|
|
|
@ -39,6 +39,12 @@ detect_arch
|
||||||
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jxpf - -C /
|
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jxpf - -C /
|
||||||
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" | tar Jxpf - -C /
|
curl -L -s "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_ARCH}.tar.xz" | tar Jxpf - -C /
|
||||||
|
|
||||||
|
# IMPORTANT: #########################################################################
|
||||||
|
# Move /init somewhere else to prevent issues with podman/RHEL #
|
||||||
|
# See: https://github.com/pi-hole/docker-pi-hole/issues/1176#issuecomment-1227587045 #
|
||||||
|
mv /init /s6-init #
|
||||||
|
######################################################################################
|
||||||
|
|
||||||
# Preseed variables to assist with using --unattended install
|
# Preseed variables to assist with using --unattended install
|
||||||
{
|
{
|
||||||
echo "PIHOLE_INTERFACE=eth0"
|
echo "PIHOLE_INTERFACE=eth0"
|
||||||
|
|
Loading…
Reference in New Issue