]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
repo-test: add el 8 target, using oracle linux 11297/head
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 7 Feb 2022 09:36:22 +0000 (10:36 +0100)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 7 Feb 2022 09:36:22 +0000 (10:36 +0100)
build-scripts/docker/repo-test/generate-repo-files.py
build-scripts/docker/repo-test/templates/Dockerfile-el.jinja2 [new file with mode: 0644]

index c4e1aa2d3320a7192f99ea1899a12f6567c6fb99..ab57a819c5a440f79544a303f2ed2b11c837774a 100755 (executable)
@@ -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 (file)
index 0000000..5e7254f
--- /dev/null
@@ -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
+