ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Make Debian 12 "bookworm" the base image

Browse Source 
Just replace "bullseye" with "bookworm" and reintroduce Debian 11
"bullseye" later.

(cherry picked from commit 2d18c57c54)
This commit is contained in:
Michal Nowak
2023-07-24 16:19:33 +02:00
parent 23099da568
commit eebe045d46
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
.gitlab-ci.yml
View File

@@ -150,20 +150,20 @@ stages:
image: "$CI_REGISTRY_IMAGE:debian-buster-amd64"
<<: *linux_amd64
.respdiff-debian-bullseye-amd64: &respdiff_debian_bullseye_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64"
.respdiff-debian-bookworm-amd64: &respdiff_debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
<<: *linux_respdiff_amd64
.debian-bullseye-amd64: &debian_bullseye_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64"
.debian-bookworm-amd64: &debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64"
<<: *linux_amd64
.tsan-debian-bullseye-amd64: &tsan_debian_bullseye_amd64_image
image: "$CI_REGISTRY_IMAGE:tsan-debian-bullseye-amd64"
.tsan-debian-bookworm-amd64: &tsan_debian_bookworm_amd64_image
image: "$CI_REGISTRY_IMAGE:tsan-debian-bookworm-amd64"
<<: *linux_amd64
.debian-bullseye-amd64cross32: &debian_bullseye_amd64cross32_image
image: "$CI_REGISTRY_IMAGE:debian-bullseye-amd64cross32"
.debian-bookworm-amd64cross32: &debian_bookworm_amd64cross32_image
image: "$CI_REGISTRY_IMAGE:debian-bookworm-amd64cross32"
<<: *linux_amd64
.debian-sid-amd64: &debian_sid_amd64_image
@@ -208,7 +208,7 @@ stages:
# This is a meta image that is used as a base for non-specific jobs
.base: &base_image
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
### QCOW2 Image Templates
@@ -645,7 +645,7 @@ tarball-create:
- job: autoreconf
artifacts: true
# Jobs for doc builds on Debian 11 "bullseye" (amd64)
# Jobs for doc builds on Debian 12 "bookworm" (amd64)
docs:
<<: *default_triggering_rules
@@ -806,48 +806,48 @@ unit:gcc:buster:amd64:
- job: gcc:buster:amd64
artifacts: true
# Jobs for regular GCC builds on Debian 11 "bullseye" (amd64)
# Jobs for regular GCC builds on Debian 12 "bookworm" (amd64)
gcc:bullseye:amd64:
gcc:bookworm:amd64:
variables:
BUILD_CONTRIB: 1
CC: gcc
CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
EXTRA_CONFIGURE: "--with-libidn2 ${WITH_READLINE_LIBEDIT}"
RUN_MAKE_INSTALL: 1
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
<<: *build_job
system:gcc:bullseye:amd64:
<<: *debian_bullseye_amd64_image
system:gcc:bookworm:amd64:
<<: *debian_bookworm_amd64_image
<<: *system_test_gcov_job
variables:
CI_ENABLE_ALL_TESTS: 1
needs:
- job: unit:gcc:bullseye:amd64
- job: unit:gcc:bookworm:amd64
artifacts: true
unit:gcc:bullseye:amd64:
<<: *debian_bullseye_amd64_image
unit:gcc:bookworm:amd64:
<<: *debian_bookworm_amd64_image
<<: *unit_test_gcov_job
variables:
CI_ENABLE_ALL_TESTS: 1
needs:
- job: gcc:bullseye:amd64
- job: gcc:bookworm:amd64
artifacts: true
# Build job for cross-compiled GCC builds on 64-bit Debian 11 "bullseye"
# Build job for cross-compiled GCC builds on 64-bit Debian 12 "bookworm"
# (amd64) with 32-bit BIND 9.
gcc:bullseye:amd64cross32:
gcc:bookworm:amd64cross32:
variables:
CFLAGS: "${CFLAGS_COMMON}"
CROSS_COMPILATION: 1
EXTRA_CONFIGURE: "--build=x86_64-linux-gnu --host=i686-linux-gnu --with-libidn2 ${WITH_READLINE_LIBEDIT}"
<<: *debian_bullseye_amd64cross32_image
<<: *debian_bookworm_amd64cross32_image
<<: *build_job
# Jobs for scan-build builds on Debian 11 "bullseye" (amd64)
# Jobs for scan-build builds on Debian 12 "bookworm" (amd64)
.scan_build: &scan_build
- ${SCAN_BUILD} --html-title="BIND 9 ($CI_COMMIT_SHORT_SHA)"
@@ -909,7 +909,7 @@ unit:gcc:sid:amd64:
- job: gcc:sid:amd64
artifacts: true
# Job for out-of-tree GCC build on Debian 11 "bullseye" (amd64)
# Job for out-of-tree GCC build on Debian 12 "bookworm" (amd64)
# Also tests configration option: --with-lmdb.
gcc:out-of-tree:
@@ -943,7 +943,7 @@ unit:gcc:out-of-tree:
<<: *unit_test_job
<<: *api_schedules_tags_triggers_web_triggering_rules
# Jobs for tarball GCC builds on Debian 11 "bullseye" (amd64)
# Jobs for tarball GCC builds on Debian 12 "bookworm" (amd64)
gcc:tarball:
variables:
@@ -1169,7 +1169,7 @@ unit:gcc:tsan:
artifacts: true
clang:tsan:
<<: *tsan_debian_bullseye_amd64_image
<<: *tsan_debian_bookworm_amd64_image
<<: *build_job
variables:
CC: "${CLANG}"
@@ -1180,7 +1180,7 @@ clang:tsan:
system:clang:tsan:
variables:
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
<<: *tsan_debian_bullseye_amd64_image
<<: *tsan_debian_bookworm_amd64_image
<<: *system_test_tsan_job
needs:
- job: clang:tsan
@@ -1189,17 +1189,17 @@ system:clang:tsan:
unit:clang:tsan:
variables:
TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}"
<<: *tsan_debian_bullseye_amd64_image
<<: *tsan_debian_bookworm_amd64_image
<<: *unit_test_tsan_job
needs:
- job: clang:tsan
artifacts: true
# Jobs for Clang builds on Debian 11 "bullseye" (amd64)
# Jobs for Clang builds on Debian 12 "bookworm" (amd64)
# The -Wno-compound-token-split-by-macro option prevents warning when compiling
# Perl DLZ module with Clang against Perl older than version 5.35.2.
clang:bullseye:amd64:
clang:bookworm:amd64:
variables:
BUILD_CONTRIB: 1
CC: ${CLANG}
@@ -1207,27 +1207,27 @@ clang:bullseye:amd64:
# See https://gitlab.isc.org/isc-projects/bind9/-/issues/3444
EXTRA_CONFIGURE: "--without-jemalloc"
RUN_MAKE_INSTALL: 1
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
<<: *build_job
system:clang:bullseye:amd64:
system:clang:bookworm:amd64:
# Set up environment variables that allow the "keyfromlabel" system test to be run
variables:
DEFAULT_OPENSSL_CONF: "/etc/ssl/openssl.cnf"
OPENSSL_CONF: "/var/tmp/etc/openssl.cnf"
SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so"
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
<<: *system_test_job
needs:
- job: clang:bullseye:amd64
- job: clang:bookworm:amd64
artifacts: true
unit:clang:bullseye:amd64:
<<: *debian_bullseye_amd64_image
unit:clang:bookworm:amd64:
<<: *debian_bookworm_amd64_image
<<: *unit_test_job
needs:
- job: clang:bullseye:amd64
- job: clang:bookworm:amd64
artifacts: true
# Jobs for Clang builds on FreeBSD 12 (amd64)
@@ -1403,7 +1403,7 @@ coverity:
respdiff-short:
<<: *respdiff_job
<<: *default_triggering_rules
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og"
@@ -1414,7 +1414,7 @@ respdiff-short:
respdiff-short:asan:
<<: *respdiff_job
<<: *default_triggering_rules
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
@@ -1427,7 +1427,7 @@ respdiff-short:asan:
respdiff-short:tsan:
<<: *respdiff_job
<<: *default_triggering_rules
<<: *tsan_debian_bullseye_amd64_image
<<: *tsan_debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
@@ -1444,7 +1444,7 @@ respdiff-short:tsan:
respdiff-long:
<<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules
<<: *respdiff_debian_bullseye_amd64_image
<<: *respdiff_debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og"
@@ -1455,7 +1455,7 @@ respdiff-long:
respdiff-long:asan:
<<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined"
@@ -1468,7 +1468,7 @@ respdiff-long:asan:
respdiff-long:tsan:
<<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules
<<: *tsan_debian_bullseye_amd64_image
<<: *tsan_debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread"
@@ -1485,7 +1485,7 @@ respdiff-long:tsan:
respdiff-long-third-party:
<<: *respdiff_job
<<: *api_schedules_tags_triggers_web_triggering_rules
<<: *debian_bullseye_amd64_image
<<: *debian_bookworm_amd64_image
variables:
CC: gcc
CFLAGS: "${CFLAGS_COMMON} -Og"
@@ -1658,7 +1658,7 @@ gcov:
<<: *default_triggering_rules
stage: postcheck
needs:
- job: system:gcc:bullseye:amd64
- job: system:gcc:bookworm:amd64
artifacts: true
script:
# *.gcno and *.gcda files generated for shared library objects are created

2
doc/arm/platforms.inc.rst
View File

@@ -45,7 +45,7 @@ Regularly Tested Platforms
Current versions of BIND 9 are fully supported and regularly tested on the
following systems:
- Debian 10, 11
- Debian 10, 12
- Ubuntu LTS 18.04, 20.04, 22.04
- Fedora 38
- Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9

2
doc/arm/requirements.txt
View File

@@ -1,5 +1,5 @@
# Make Read the Docs use the exact same package versions as in
# registry.gitlab.isc.org/isc-projects/images/bind9:debian-bullseye-amd64
# registry.gitlab.isc.org/isc-projects/images/bind9:debian-bookworm-amd64
Sphinx==6.1.3
docutils==0.18.1
sphinx_rtd_theme==1.2.0