From 0cf69edaab9031289093c51e55a668260efdc237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Tue, 29 Jan 2019 12:41:49 +0100
Subject: [PATCH] Fix Fedora Dockerfile template

---
 .gitlab-ci.yml                              | 12 +++++++++
 Makefile                                    |  3 +++
 docker/bind9/fedora-amd64:latest/Dockerfile | 17 -------------
 docker/bind9/fedora-template/Dockerfile     | 27 +++++++++++++++++++++
 4 files changed, 42 insertions(+), 17 deletions(-)
 delete mode 100644 docker/bind9/fedora-amd64:latest/Dockerfile
 create mode 100644 docker/bind9/fedora-template/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 281cf0c..1be3baa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,18 @@ centos_centos7_amd64:
     - amd64
   <<: *image
 
+fedora_29_amd64:
+  stage: images
+  variables:
+    DISTROS: fedora
+    VERSIONS: 29
+    ARCHS: amd64
+  tags:
+    - linux
+    - docker
+    - amd64
+  <<: *image
+
 debian_jessie_amd64:
   stage: images
   variables:
diff --git a/Makefile b/Makefile
index f56fea2..1adcc06 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,17 @@ ARCHS ?= amd64 i386
 
 default_centos_VERSIONS := centos6 centos7
 default_debian_VERSIONS := jessie stretch buster sid
+default_fedora_VERSIONS := 29
 default_ubuntu_VERSIONS := trusty xenial artful bionic
 ifneq (,$(VERSIONS))
 centos_VERSIONS = $(filter $(VERSIONS),$(default_centos_VERSIONS))
 debian_VERSIONS = $(filter $(VERSIONS),$(default_debian_VERSIONS))
+fedora_VERSIONS = $(filter $(VERSIONS),$(default_fedora_VERSIONS))
 ubuntu_VERSIONS = $(filter $(VERSIONS),$(default_ubuntu_VERSIONS))
 else
 centos_VERSIONS ?= $(default_centos_VERSIONS)
 debian_VERSIONS ?= $(default_debian_VERSIONS)
+fedora_VERSIONS ?= $(default_fedora_VERSIONS)
 ubuntu_VERSIONS ?= $(default_ubuntu_VERSIONS)
 endif
 
diff --git a/docker/bind9/fedora-amd64:latest/Dockerfile b/docker/bind9/fedora-amd64:latest/Dockerfile
deleted file mode 100644
index 3228503..0000000
--- a/docker/bind9/fedora-amd64:latest/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM fedora:latest
-MAINTAINER Knot DNS <knot-dns@labs.nic.cz>
-ENV DEBIAN_FRONTEND noninteractive
-RUN dnf -y upgrade
-RUN yum -y install		\
-	'autoconf'		\
-	'automake'		\
-	'bison'			\
-	'libtool'		\
-	'lmdb-devel'		\
-	'pkgconfig'		\
-	'pkgconfig(openssl)'	\
-	'pkgconfig(jansson)'	\
-	'pkgconfig(libcap2)'	\
-	'openldap-devel'	\
-	'krb5-devel'		\
-	'pkgconfig(libxml-2.0)'
diff --git a/docker/bind9/fedora-template/Dockerfile b/docker/bind9/fedora-template/Dockerfile
new file mode 100644
index 0000000..e294fc7
--- /dev/null
+++ b/docker/bind9/fedora-template/Dockerfile
@@ -0,0 +1,27 @@
+FROM @SOURCE_IMAGE@
+MAINTAINER BIND 9 Developers <bind9-dev@isc.org>
+RUN dnf -y upgrade
+RUN dnf -y install \
+	ccache \
+	gcc \
+	GeoIP-devel \
+	git \
+	iproute \
+	json-c-devel \
+	krb5-devel \
+	kyua \
+	libcap-devel \
+	libcmocka-devel \
+	libidn2-devel \
+	libtool \
+	libxml2-devel \
+	lmdb-devel \
+	make \
+	openldap-devel \
+	openssl-devel \
+	perl \
+	perl-JSON \
+	perl-Net-DNS-Nameserver \
+	perl-XML-Simple \
+	python-dns \
+	python-ply
-- 
GitLab