Merge pull request #1182 from pi-hole/dev

Dev -> Master

src/Dockerfile

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

src/scripts/install.sh

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

test/requirements.txt

@@ -47,7 +47,7 @@ testinfra==3.3.0
 texttable==1.6.2
 toml==0.10.0
 tox==3.14.3
-urllib3==1.25.9
+urllib3==1.26.5
 virtualenv==16.7.9
 wcwidth==0.1.7
 websocket-client==0.57.0