From 7d876222c5c307b49c6cb689df088866f41790cc Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 15 Nov 2022 09:21:10 -0500 Subject: [PATCH 1/5] Use `dnssec.works` instead of `verteiltesysteme.net` for tests As the latter broke [1], this PR updates the tests to use a different DNSSEC validation service: https://dnssec.works [1] https://github.com/pi-hole/FTL/pull/1469#issuecomment-1307718167 Signed-off-by: Kyle Harding --- README.md | 11 +++++++---- docker-compose.test.yml | 7 +++++-- examples/pi-hole/docker-compose.yml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c785768..f6cde89 100644 --- a/README.md +++ b/README.md @@ -60,11 +60,14 @@ docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset -p yes # run a detached unbound container docker run --rm -d --name unbound klutchell/unbound -# run dig with dnssec to test an example NOERROR endpoint -docker exec unbound dig sigok.verteiltesysteme.net @127.0.0.1 +dnssec +# run dig with dnssec to test NOERROR +docker exec unbound dig @127.0.0.1 dnssec.works +dnssec +multi -# run dig with dnssec to test an example SERVFAIL endpoint -docker exec unbound dig sigfail.verteiltesysteme.net @127.0.0.1 +dnssec +# run dig with dnssec to test SERVFAIL +docker exec unbound dig @127.0.0.1 fail01.dnssec.works +dnssec +multi +docker exec unbound dig @127.0.0.1 fail02.dnssec.works +dnssec +multi +docker exec unbound dig @127.0.0.1 fail03.dnssec.works +dnssec +multi +docker exec unbound dig @127.0.0.1 fail04.dnssec.works +dnssec +multi # stop and remove the container docker stop unbound diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 5dfce4e..47e5686 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -32,6 +32,9 @@ services: command: >- /bin/sh -c ' apk add --no-cache bind-tools && - dig sigok.verteiltesysteme.net @server +dnssec | tee /dev/stderr | grep -wq NOERROR && - dig sigfail.verteiltesysteme.net @server +dnssec | tee /dev/stderr | grep -wq SERVFAIL + dig @server dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq NOERROR && + dig @server fail01.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail02.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail03.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail04.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL ' diff --git a/examples/pi-hole/docker-compose.yml b/examples/pi-hole/docker-compose.yml index 8b04df9..e312cbd 100644 --- a/examples/pi-hole/docker-compose.yml +++ b/examples/pi-hole/docker-compose.yml @@ -31,7 +31,7 @@ services: default: ipv4_address: 172.28.0.2 healthcheck: - test: ["CMD", "dig", "-p", "53", "sigok.verteiltesysteme.net", "@127.0.0.1"] + test: ["CMD", "dig", "-p", "53", "dnssec.works", "@127.0.0.1"] interval: 30s timeout: 30s retries: 3 From 0f0f7e964c952f0eb023d2a7fb4dd50aa0cb6584 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 15 Nov 2022 09:26:43 -0500 Subject: [PATCH 2/5] Update default bake target name Signed-off-by: Kyle Harding --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index fad389c..1eb4981 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -6,7 +6,7 @@ variable "GITHUB_REPOSITORY" { default = "klutchell/unbound-docker" } -target "server" { +target "default" { context = "./" dockerfile = "Dockerfile" platforms = [ From 2b008ab46226b39dfe1a612cdaf2f9c22ef0c778 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 15 Nov 2022 09:29:52 -0500 Subject: [PATCH 3/5] Use development branch of flowzone Signed-off-by: Kyle Harding --- .github/workflows/flowzone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index b8944f6..70d412a 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -13,7 +13,7 @@ on: jobs: flowzone: name: Flowzone - uses: product-os/flowzone/.github/workflows/flowzone.yml@master + uses: product-os/flowzone/.github/workflows/flowzone.yml@kyle/combine-docker-jobs secrets: FLOWZONE_TOKEN: ${{ secrets.FLOWZONE_TOKEN }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} From 84c8ae5e10f8a85ef5edb8163000f24dcf97d09c Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 15 Nov 2022 09:35:51 -0500 Subject: [PATCH 4/5] Fix additional cache locations using main branch Signed-off-by: Kyle Harding --- docker-bake.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 1eb4981..64c1408 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -18,8 +18,8 @@ target "default" { cache-from = [ "ghcr.io/klutchell/unbound:latest", "docker.io/klutchell/unbound:latest", - "ghcr.io/klutchell/unbound:master", - "docker.io/klutchell/unbound:master", + "ghcr.io/klutchell/unbound:main", + "docker.io/klutchell/unbound:main", "type=registry,ref=ghcr.io/klutchell/unbound:buildkit-cache-${base64encode(GITHUB_REF_NAME)},mode=max" ] cache-to = [ From 3d60dfaad701a9d5ea6371c9c7dcf1fc51e60b6e Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Wed, 16 Nov 2022 09:57:46 -0500 Subject: [PATCH 5/5] Cleanup the tests and extend timeouts for lame dns Signed-off-by: Kyle Harding --- docker-compose.test.yml | 17 +++++------------ docker-compose.yml | 5 ----- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 47e5686..0754248 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -7,24 +7,17 @@ services: build: context: . dockerfile: Dockerfile - networks: - - internal - command: -v -v -v + command: -v -v version: image: localhost:5000/sut build: context: . dockerfile: Dockerfile - networks: - - internal command: -V - restart: always sut: image: alpine:3.16 - networks: - - internal depends_on: - server - version @@ -33,8 +26,8 @@ services: /bin/sh -c ' apk add --no-cache bind-tools && dig @server dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq NOERROR && - dig @server fail01.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && - dig @server fail02.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && - dig @server fail03.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL && - dig @server fail04.dnssec.works +dnssec +multi | tee /dev/stderr | grep -wq SERVFAIL + dig @server fail01.dnssec.works +dnssec +multi +time=120 | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail02.dnssec.works +dnssec +multi +time=120 | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail03.dnssec.works +dnssec +multi +time=120 | tee /dev/stderr | grep -wq SERVFAIL && + dig @server fail04.dnssec.works +dnssec +multi +time=120 | tee /dev/stderr | grep -wq SERVFAIL ' diff --git a/docker-compose.yml b/docker-compose.yml index ff8cac4..bfb1fcb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,3 @@ services: build: context: . dockerfile: Dockerfile - networks: - - internal - -networks: - internal: {}