Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbound version 1.19.1 - fix #40 #45

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
41d5768
Test sid repo
aleksanderbl29 Feb 18, 2024
e07f766
Update(image): Pihole v 2024.02.2
aleksanderbl29 Feb 28, 2024
c079a9f
remove branch in build
aleksanderbl29 Feb 28, 2024
1c9c139
format dockerfile
aleksanderbl29 Feb 28, 2024
7cee92a
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Feb 28, 2024
0388092
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Feb 28, 2024
06ef54a
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Feb 28, 2024
20ceeb3
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Mar 9, 2024
4bfe011
apt-get upgrade -y
aleksanderbl29 Mar 9, 2024
98dd420
undo commit 4bfe011
aleksanderbl29 Mar 9, 2024
dc34476
update image
aleksanderbl29 Apr 4, 2024
7a00c72
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Apr 4, 2024
097c14d
Add apt-get upgrade to build process
aleksanderbl29 Apr 4, 2024
536b049
Merge branch '40-dnssec-vulnerabilities' of https://github.com/aleksa…
aleksanderbl29 Apr 4, 2024
9fd0750
insignificant change to trigger rebuild
aleksanderbl29 Apr 6, 2024
b0864e8
add easy deployment of my dev image
aleksanderbl29 Apr 6, 2024
747a8da
update local build guide
aleksanderbl29 Apr 6, 2024
82cdde8
change distro to trixie
aleksanderbl29 Apr 12, 2024
6bdd65f
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Apr 12, 2024
8be5eab
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 May 9, 2024
8b17ddb
change from trixie to sid
aleksanderbl29 May 12, 2024
1d3e319
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 May 24, 2024
c0e74d5
Split apt get
aleksanderbl29 May 24, 2024
cacb9a7
Add dash v
aleksanderbl29 May 24, 2024
d87244c
Change order of platforms in build
aleksanderbl29 May 24, 2024
610c641
Stop upgrading pacakges
aleksanderbl29 May 24, 2024
8a82d51
Upgrade dependicies
aleksanderbl29 May 24, 2024
832addf
Fix broken dependency
aleksanderbl29 May 24, 2024
474a649
Fix broken dependency
aleksanderbl29 May 24, 2024
6a9c1c8
Try not updating other packages before install
aleksanderbl29 May 24, 2024
616ce4b
Change track to trixie
aleksanderbl29 May 24, 2024
6f5e48a
Remember to update packages before installing
aleksanderbl29 May 24, 2024
b6819ec
Reenable package updates now with trixie
aleksanderbl29 May 24, 2024
a8bca60
Disable package updates
aleksanderbl29 May 24, 2024
5d26765
Merge branch 'main' into 40-dnssec-vulnerabilities
aleksanderbl29 Oct 30, 2024
4e1cd38
Some effort to try fix the error
aleksanderbl29 Oct 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/auto-build-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
uses: docker/build-push-action@v6
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 }}
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ Try pinging `google.com` vs pinging `8.8.8.8`. If `google.com` fails but `8.8.8.
- [ ] 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
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ services:
- 127.0.0.1
container_name: pihole
# image: aleksanderbl/pihole-unbound:2024.03.2
# image: dev/docker-pihole-unbound:latest
image: aleksanderbl/pihole-unbound:dev-45-2024-04-04
image: dev/docker-pihole-unbound:latest
hostname: ${HOSTNAME}
domainname: ${DOMAIN_NAME}
ports:
Expand Down
18 changes: 15 additions & 3 deletions pihole-unbound/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
FROM pihole/pihole:2024.07.0
RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list
RUN apt-get update && apt-get -t bookworm install -y unbound
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
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
Loading