docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1181 from pi-hole/fix-podman-issues 

Fix issues with Podman and S6 overlay
This commit is contained in:
Adam Warner 2022-08-25 21:50:09 +01:00 committed by GitHub
parent a7c7be01c1 8619de0031
commit 471e0425c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Dockerfile
View File

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

6
src/scripts/install.sh
View File

@ -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-${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"