Skip to content

Commit

Permalink
Revert change that removed the moving of /init to /s6-init. Add comme…
Browse files Browse the repository at this point in the history
…nts to make sure it does not get removed again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
  • Loading branch information
PromoFaux committed Aug 25, 2022
1 parent a7c7be0 commit a9f1fed
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV S6_OVERLAY_VERSION v3.1.1.2
COPY ./scripts/install.sh /usr/local/bin/install.sh
ENV PIHOLE_INSTALL /etc/.pihole/automated\ install/basic-install.sh

ENTRYPOINT [ "/init" ]
ENTRYPOINT [ "/s6-init" ]

COPY s6/debian-root /
COPY s6/service /usr/local/bin/service
Expand Down
7 changes: 7 additions & 0 deletions src/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ 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-${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
{
echo "PIHOLE_INTERFACE=eth0"
Expand Down

0 comments on commit a9f1fed

Please sign in to comment.