From efe1b9d58b58dc3934b4a6ee27c614b3cb7bc7d4 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 22 Nov 2024 12:18:38 +0100
Subject: [PATCH] builder: add ubuntu-oracular target

---
 .github/workflows/builder.yml                 |  1 +
 .../Dockerfile.target.ubuntu-oracular         | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 0352f5c505..b2b53fcc5f 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -41,6 +41,7 @@ jobs:
           - ubuntu-lunar
           - ubuntu-mantic
           - ubuntu-noble
+          - ubuntu-oracular
           - debian-bookworm
           - debian-trixie
           - amazon-2023
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular b/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular
new file mode 100644
index 0000000000..1069467e13
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.ubuntu-oracular
@@ -0,0 +1,30 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+FROM ubuntu:oracular as dist-base
+
+ARG BUILDER_CACHE_BUSTER=
+ARG APT_URL
+RUN apt-get update && apt-get -y dist-upgrade
+# FIXME: Package usrmerge missing sha256 str
+RUN apt-get purge -y usrmerge
+
+@INCLUDE Dockerfile.debbuild-prepare
+
+@IF [ -n "$M_authoritative$M_all" ]
+ADD builder-support/debian/authoritative/debian-buster/ pdns-${BUILDER_VERSION}/debian/
+@ENDIF
+
+@IF [ -n "$M_recursor$M_all" ]
+ADD builder-support/debian/recursor/debian-buster/ pdns-recursor-${BUILDER_VERSION}/debian/
+@ENDIF
+
+@IF [ -n "$M_dnsdist$M_all" ]
+ADD builder-support/debian/dnsdist/debian-buster/ dnsdist-${BUILDER_VERSION}/debian/
+@ENDIF
+
+@INCLUDE Dockerfile.debbuild
+
+# Do a test install and verify
+# Can be skipped with skiptests=1 in the environment
+# @EXEC [ "$skiptests" = "" ] && include Dockerfile.debtest
-- 
2.47.2