From: Peter van Dijk Date: Mon, 7 Feb 2022 09:36:22 +0000 (+0100) Subject: repo-test: add el 8 target, using oracle linux X-Git-Tag: auth-4.7.0-alpha1~16^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0888aa0479d007129888e972051bbc7de41a917e;p=thirdparty%2Fpdns.git repo-test: add el 8 target, using oracle linux --- diff --git a/build-scripts/docker/repo-test/generate-repo-files.py b/build-scripts/docker/repo-test/generate-repo-files.py index c4e1aa2d33..ab57a819c5 100755 --- a/build-scripts/docker/repo-test/generate-repo-files.py +++ b/build-scripts/docker/repo-test/generate-repo-files.py @@ -72,11 +72,13 @@ def write_dockerfile (os, os_version, release): if os == 'raspbian': os_image = 'resin/rpi-raspbian' + elif os == 'el': + os_image = 'oraclelinux' else: os_image = os if release.startswith('auth-'): - if os == 'centos': + if os in ('centos', 'el'): pkg = 'pdns' else: pkg = 'pdns-server' @@ -156,7 +158,7 @@ def write_release_files (release): if release in ['auth-43', 'auth-44', 'auth-45', 'auth-46', 'auth-master', 'rec-43', 'rec-44', 'rec-45', 'rec-46', 'rec-master', 'dnsdist-15', 'dnsdist-16', 'dnsdist-17', 'dnsdist-master']: - write_dockerfile('centos', '8', release) + write_dockerfile('el', '8', release) write_dockerfile('debian', 'buster', release) write_list_file('debian', 'buster', release) diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 new file mode 100644 index 0000000000..5e7254fad7 --- /dev/null +++ b/build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 @@ -0,0 +1,22 @@ +FROM {{ os_image }}:{{ os_version }} + +RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm bind-utils + +{% if os_version == '7' %} +RUN yum install -y yum-plugin-priorities +{% endif %} + +{% if release == 'dnsdist-15' and os_version == '8' %} +RUN dnf install -y 'dnf-command(config-manager)' +RUN dnf config-manager --set-enabled powertools +{% endif %} + +RUN curl -o /etc/yum.repos.d/powerdns-{{ release }}.repo https://repo.powerdns.com/repo-files/{{ os }}-{{ release }}.repo +RUN yum install --assumeyes {%- if os_version == '8' %} --nobest{% endif %} {{ pkg }} + +{% if release.startswith('rec-') %} +RUN mkdir /var/run/pdns-recursor +{% endif %} + +CMD {{ cmd }} --version +