From 41d576815b1671f1dcc538d0642492c0b134e707 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sun, 18 Feb 2024 22:56:10 +0100
Subject: [PATCH 01/26] Test sid repo

---
 pihole-unbound/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index e347c3a..9ed325d 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,6 +1,6 @@
 FROM pihole/pihole:2024.02.0
-RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t bullseye-backports install -y unbound
+RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
+RUN apt-get update && apt-get -t sid install -y unbound
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf

From e07f7662ec20f17a4c97a34763ff11f4bb8f5bd3 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:21:40 +0100
Subject: [PATCH 02/26] Update(image): Pihole v 2024.02.2

---
 docker-compose.yaml       | 2 +-
 pihole-unbound/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9dc2da5..8e00890 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,7 +9,7 @@ services:
     dns:
       - 127.0.0.1
     container_name: pihole
-    image: aleksanderbl/pihole-unbound:2024.02.0
+    image: aleksanderbl/pihole-unbound:2024.02.2
     hostname: ${HOSTNAME}
     domainname: ${DOMAIN_NAME}
     ports:
diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 9ed325d..0e8697d 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,4 +1,4 @@
-FROM pihole/pihole:2024.02.0
+FROM pihole/pihole:2024.02.2
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -t sid install -y unbound
 

From c079a9fd9189151b16ef4cae3850d899fdb9d4f2 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:32:35 +0100
Subject: [PATCH 03/26] remove branch in build

---
 .github/workflows/dev-build.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index 6eb1c5b..3331bbb 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -4,8 +4,6 @@ name: Build and publish container in development
 on:
   # cron job to trigger the build on any push to main
   pull_request:
-    branches:
-      - main
     types: [opened, synchronize, reopened]
 
 permissions:

From 1c9c139e3e6a67a9e0ae4c2f502812107da45111 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:42:01 +0100
Subject: [PATCH 04/26] format dockerfile

---
 pihole-unbound/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 0e8697d..cdfc007 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,12 +1,16 @@
 FROM pihole/pihole:2024.02.2
+
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -t sid install -y unbound
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf
 COPY 99-edns.conf /etc/dnsmasq.d/99-edns.conf
+
 RUN mkdir -p /etc/services.d/unbound
+
 COPY unbound-run /etc/services.d/unbound/run
+
 RUN chmod 774 /etc/services.d/unbound/run
 
 ENTRYPOINT ./s6-init
\ No newline at end of file

From 4bfe0118b516217f853845c336c5c89541354be6 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sun, 10 Mar 2024 00:22:16 +0100
Subject: [PATCH 05/26] apt-get upgrade -y

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index cdfc007..4622b97 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,7 +1,7 @@
 FROM pihole/pihole:2024.02.2
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t sid install -y unbound
+RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf

From 98dd4201596867d999e81e23668b80ea52ff5cf9 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sun, 10 Mar 2024 00:30:10 +0100
Subject: [PATCH 06/26] undo commit 4bfe011

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 4622b97..cdfc007 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,7 +1,7 @@
 FROM pihole/pihole:2024.02.2
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
-RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound
+RUN apt-get update && apt-get -t sid install -y unbound
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf

From dc344761223db45aa53ad9bf7585ae14551c9fff Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:49:42 +0200
Subject: [PATCH 07/26] update image

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index cdfc007..7d958aa 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,4 +1,4 @@
-FROM pihole/pihole:2024.02.2
+FROM pihole/pihole:2024.03.2
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -t sid install -y unbound

From 097c14d5aec78c6a896b453f7a01485e9785ae91 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Thu, 4 Apr 2024 14:05:36 +0200
Subject: [PATCH 08/26] Add apt-get upgrade to build process

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 7d958aa..6110c3e 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,7 +1,7 @@
 FROM pihole/pihole:2024.03.2
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t sid install -y unbound
+RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound -V
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf

From 9fd07506250a396daa2a519f986e71dad80725de Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sat, 6 Apr 2024 16:04:18 +0200
Subject: [PATCH 09/26] insignificant change to trigger rebuild

---
 pihole-unbound/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 6110c3e..0ca6e99 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,6 +1,7 @@
 FROM pihole/pihole:2024.03.2
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
+
 RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound -V
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf

From b0864e8abc99dff61d8799ef7f4339b676f1531f Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sat, 6 Apr 2024 17:30:40 +0200
Subject: [PATCH 10/26] add easy deployment of my dev image

---
 docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8c82738..2c5218e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -10,6 +10,7 @@ services:
       - 127.0.0.1
     container_name: pihole
     image: aleksanderbl/pihole-unbound:2024.03.2
+    # image: dev/docker-pihole-unbound:latest
     hostname: ${HOSTNAME}
     domainname: ${DOMAIN_NAME}
     ports:

From 747a8da6af5dd4aca8b16d3e1eeec452546b91be Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sat, 6 Apr 2024 17:30:49 +0200
Subject: [PATCH 11/26] update local build guide

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 97da430..b72d29f 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,7 @@ docker-compose up -d
 - [ ] Run the commands below
 
 ```bash
-cd docker-pihole-unbound
-docker build . -t dev/docker-pihole-unbound:latest
+docker build ./pihole-unbound/ -t dev/docker-pihole-unbound:latest
 ```
 
 ## Automatic dev builds with Github Actions

From 82cdde832b2706854cf6b5e03d58bf1a576e1c6c Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 12 Apr 2024 21:06:46 +0200
Subject: [PATCH 12/26] change distro to trixie

---
 pihole-unbound/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 0ca6e99..21ad8b0 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,8 +1,8 @@
 FROM pihole/pihole:2024.03.2
 
-RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
+RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
-RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound -V
+RUN apt-get update && apt-get upgrade -y && apt-get -t trixie install -y unbound -V
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf

From 8b17ddb8b700f8c640c4a6a9f6a73bbeed2ace79 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Sun, 12 May 2024 20:06:21 +0200
Subject: [PATCH 13/26] change from trixie to sid

---
 pihole-unbound/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 97d28af..6aedaa5 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,8 +1,8 @@
 FROM pihole/pihole:2024.05.0
 
-RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
+RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
-RUN apt-get update && apt-get upgrade -y && apt-get -t trixie install -y unbound -V
+RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound -V
 
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf

From c0e74d5c62160a5ec4e359cf4fc773c662b084a1 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:14:13 +0200
Subject: [PATCH 14/26] Split apt get

---
 pihole-unbound/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 6aedaa5..23d5190 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -2,7 +2,9 @@ FROM pihole/pihole:2024.05.0
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
-RUN apt-get update && apt-get upgrade -y && apt-get -t sid install -y unbound -V
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get -t sid install -y unbound -V
 
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf

From cacb9a734d09eb2dcfe7374243019420f7c3c1be Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:18:58 +0200
Subject: [PATCH 15/26] Add dash v

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 23d5190..14dfffd 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN apt-get upgrade -y
+RUN apt-get upgrade -y -V
 RUN apt-get -t sid install -y unbound -V
 
 

From d87244c515d069efdc862d8cb1de55af3f262583 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:30:09 +0200
Subject: [PATCH 16/26] Change order of platforms in build

---
 .github/workflows/auto-build-container.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-build-container.yml b/.github/workflows/auto-build-container.yml
index 1123d8a..2d05504 100644
--- a/.github/workflows/auto-build-container.yml
+++ b/.github/workflows/auto-build-container.yml
@@ -60,7 +60,7 @@ jobs:
       uses: docker/build-push-action@v5
       with:
         context: "{{defaultContext}}:pihole-unbound/"
-        platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
+        platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
         push: true
         tags: aleksanderbl/pihole-unbound:latest,aleksanderbl/pihole-unbound:${{ steps.latest_release.outputs.release }}
       if: ${{ steps.latest_release.outputs.release != steps.previous_release.outputs.release }}

From 610c6414e2973c08aeb49f024692e13d13757fba Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:34:25 +0200
Subject: [PATCH 17/26] Stop upgrading pacakges

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 14dfffd..0a9316a 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN apt-get upgrade -y -V
+# RUN apt-get upgrade -y -V
 RUN apt-get -t sid install -y unbound -V
 
 

From 8a82d5169c0304d1d57bcbe5f3075b5e77e1e62e Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:39:54 +0200
Subject: [PATCH 18/26] Upgrade dependicies

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 0a9316a..969efc1 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
 RUN apt-get update
-# RUN apt-get upgrade -y -V
+RUN apt-get upgrade libreadline8t64 -y
 RUN apt-get -t sid install -y unbound -V
 
 

From 832addff27b192d4e292a9dd5e4550a548023ac8 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:42:01 +0200
Subject: [PATCH 19/26] Fix broken dependency

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 969efc1..7c11914 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN apt-get upgrade libreadline8t64 -y
+RUN apt-get upgrade -f libreadline8t64
 RUN apt-get -t sid install -y unbound -V
 
 

From 474a6496938c5c46320aae4199a473c7c705fb1b Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:43:40 +0200
Subject: [PATCH 20/26] Fix broken dependency

---
 pihole-unbound/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 7c11914..031893f 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,8 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN apt-get upgrade -f libreadline8t64
+RUN apt-get upgrade libreadline8 -y
+RUN apt-get upgrade libreadline8t64 -y
 RUN apt-get -t sid install -y unbound -V
 
 

From 6a9c1c8dcb214969403fb408ed46a4a40dcc6716 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:45:18 +0200
Subject: [PATCH 21/26] Try not updating other packages before install

---
 pihole-unbound/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 031893f..7d673e1 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -2,9 +2,9 @@ FROM pihole/pihole:2024.05.0
 
 RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
 
-RUN apt-get update
-RUN apt-get upgrade libreadline8 -y
-RUN apt-get upgrade libreadline8t64 -y
+# RUN apt-get update
+# RUN apt-get upgrade libreadline8 -y
+# RUN apt-get upgrade libreadline8t64 -y
 RUN apt-get -t sid install -y unbound -V
 
 

From 616ce4b32c62f30813055ea4b46efa286ec9263f Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:50:12 +0200
Subject: [PATCH 22/26] Change track to trixie

---
 pihole-unbound/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 7d673e1..896c62d 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,11 +1,11 @@
 FROM pihole/pihole:2024.05.0
 
-RUN echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list
+RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
 # RUN apt-get update
 # RUN apt-get upgrade libreadline8 -y
 # RUN apt-get upgrade libreadline8t64 -y
-RUN apt-get -t sid install -y unbound -V
+RUN apt-get -t trixie install -y unbound -V
 
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf

From 6f5e48aed306f07a74d8d3a38621782d785f24bf Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:50:31 +0200
Subject: [PATCH 23/26] Remember to update packages before installing

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 896c62d..18eca85 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -2,7 +2,7 @@ FROM pihole/pihole:2024.05.0
 
 RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
-# RUN apt-get update
+RUN apt-get update
 # RUN apt-get upgrade libreadline8 -y
 # RUN apt-get upgrade libreadline8t64 -y
 RUN apt-get -t trixie install -y unbound -V

From b6819eca7242a6afe8aea679f415b75ff574cb0f Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:55:52 +0200
Subject: [PATCH 24/26] Reenable package updates now with trixie

---
 docker-compose.yaml       | 4 ++--
 pihole-unbound/Dockerfile | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4af88bd..dde6742 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,8 +8,8 @@ services:
     dns:
       - 127.0.0.1
     container_name: pihole
-    image: aleksanderbl/pihole-unbound:2024.03.2
-    # image: dev/docker-pihole-unbound:latest
+    # image: aleksanderbl/pihole-unbound:2024.03.2
+    image: dev/docker-pihole-unbound:latest
     hostname: ${HOSTNAME}
     domainname: ${DOMAIN_NAME}
     ports:
diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 18eca85..0b4e467 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,8 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
 RUN apt-get update
-# RUN apt-get upgrade libreadline8 -y
-# RUN apt-get upgrade libreadline8t64 -y
+RUN apt-get upgrade -y
 RUN apt-get -t trixie install -y unbound -V
 
 

From a8bca60e2c099e8d9209427280fec3b2132a6213 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Fri, 24 May 2024 17:58:00 +0200
Subject: [PATCH 25/26] Disable package updates

---
 pihole-unbound/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 0b4e467..413987e 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -3,7 +3,7 @@ FROM pihole/pihole:2024.05.0
 RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
 RUN apt-get update
-RUN apt-get upgrade -y
+# RUN apt-get upgrade -y
 RUN apt-get -t trixie install -y unbound -V
 
 

From 4e1cd38bc8c441228f460755ffc70507d15ed292 Mon Sep 17 00:00:00 2001
From: aleksanderbl29 <73799306+aleksanderbl29@users.noreply.github.com>
Date: Thu, 31 Oct 2024 13:53:49 +0100
Subject: [PATCH 26/26] Some effort to try fix the error

---
 pihole-unbound/Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 37c4542..046f804 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,10 +1,15 @@
-FROM pihole/pihole:2024.07.0
+FROM pihole/pihole:2024.07.0 AS base
 
 RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
 
+RUN apt-get update
+RUN apt-get install -s usrmerge
+
+FROM base
 RUN apt-get update
 # RUN apt-get upgrade -y
 RUN apt-get -t trixie install -y unbound -V
+# RUN apt-get install -y unbound -V
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf