From: Erik Winkels Date: Mon, 9 Dec 2019 09:52:37 +0000 (+0100) Subject: Fix CentOS 8 issue and install `dig`. X-Git-Tag: rec-4.3.0-beta1~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8599%2Fhead;p=thirdparty%2Fpdns.git Fix CentOS 8 issue and install `dig`. --- diff --git a/build-scripts/docker/generate-repo-files.sh b/build-scripts/docker/generate-repo-files.sh index 4b1d0ebb2b..e3d7cdfa0c 100755 --- a/build-scripts/docker/generate-repo-files.sh +++ b/build-scripts/docker/generate-repo-files.sh @@ -21,7 +21,14 @@ write_centos() cat < Dockerfile.$RELEASE.$OS-$VERSION FROM $OS:$VERSION -RUN yum install -y epel-release yum-plugin-priorities +RUN yum install -y epel-release bind-utils +EOF + if [ "$VERSION" = "6" -o "$VERSION" = "7" ]; then + cat <> Dockerfile.$RELEASE.$OS-$VERSION +RUN yum install -y yum-plugin-priorities +EOF + fi + cat <> Dockerfile.$RELEASE.$OS-$VERSION RUN curl -o /etc/yum.repos.d/powerdns-$RELEASE.repo https://repo.powerdns.com/repo-files/$OS-$RELEASE.repo RUN yum install -y $PKG @@ -48,7 +55,7 @@ EOF FROM $OS:$VERSION RUN apt-get update -RUN apt-get install -y curl gnupg +RUN apt-get install -y curl gnupg dnsutils COPY pdns.debian-and-ubuntu /etc/apt/preferences.d/pdns COPY pdns.list.$RELEASE.$OS-$VERSION /etc/apt/sources.list.d/pdns.list