From 33966f8eb2cfcf33ea4da9f594296ca3d43e4821 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Aug 2022 19:32:22 +0000
Subject: [PATCH 1/2] Bump urllib3 from 1.25.9 to 1.26.5

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 test/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/requirements.txt b/test/requirements.txt
index a92ce3b..ecc956e 100644
--- a/test/requirements.txt
+++ b/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

From 8619de00315e0cfb03d3d166babc2d246313f980 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Thu, 25 Aug 2022 19:27:24 +0100
Subject: [PATCH 2/2] 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>
---
 src/Dockerfile         | 2 +-
 src/scripts/install.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Dockerfile b/src/Dockerfile
index 0dc507c..670a0d0 100644
--- a/src/Dockerfile
+++ b/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
diff --git a/src/scripts/install.sh b/src/scripts/install.sh
index 51b581c..f88a4ff 100644
--- a/src/scripts/install.sh
+++ b/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"