Merge pull request PowerDNS#12683 from Habbie/remove-ubuntu-bionic

builder: remove ubuntu bionic target
mayhemheroes · May 9, 2023 · bf3597c · bf3597c
2 parents d0f9cf5 + 37285a5
commit bf3597c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 42 deletions.
diff --git a/.github/workflows/builder-dispatch.yml b/.github/workflows/builder-dispatch.yml
@@ -20,7 +20,6 @@ on:
           el-9
           debian-buster
           debian-bullseye
-          ubuntu-bionic
           ubuntu-focal
           ubuntu-jammy
       ref:

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -19,7 +19,6 @@ jobs:
         product: ['authoritative', 'recursor', 'dnsdist']
         os:
           - centos-7
-          - ubuntu-bionic
           - el-8
           - centos-8-stream
           - centos-9-stream

diff --git a/builder-support/dockerfiles/Dockerfile.target.docs b/builder-support/dockerfiles/Dockerfile.target.docs
@@ -1,12 +1,11 @@
 # Sphinx
-FROM ubuntu:bionic as pdns-docs
+FROM ubuntu:jammy as pdns-docs
 RUN apt-get update && apt-get -y dist-upgrade && apt-get -y --no-install-recommends install \
     ghostscript \
     git \
     latexmk \
     make \
-    python-minimal \
-    python2.7 \
+    python3-minimal \
     texlive \
     texlive-font-utils \
     texlive-fonts-extra \

diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-amd64
diff --git a/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64 b/builder-support/dockerfiles/Dockerfile.target.ubuntu-bionic-arm64