From ab5a3b89b34563faf97be67115cb7cc1c81e51d8 Mon Sep 17 00:00:00 2001
From: Matous Holinka <matous.holinka@nic.cz>
Date: Fri, 22 Nov 2019 09:23:47 +0100
Subject: [PATCH] bird: dockerfiles were fixed (fedora)

---
 .gitlab-ci.yml                         | 22 ++++++----------------
 misc/docker/fedora-25-amd64/Dockerfile |  1 +
 misc/docker/fedora-26-amd64/Dockerfile |  1 +
 misc/docker/fedora-27-amd64/Dockerfile |  1 +
 misc/docker/fedora-28-amd64/Dockerfile |  1 +
 misc/docker/fedora-29-amd64/Dockerfile |  1 +
 misc/docker/fedora-30-amd64/Dockerfile |  1 +
 misc/docker/fedora-31-amd64/Dockerfile |  1 +
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f25211c6..0d4c6e715 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -174,15 +174,6 @@ docker_ubuntu-19_04-amd64:
   # Run tests if they are available
   - $MAKE check
 
-.build: &preprocessing-fedora
-  stage: build
-  script:
-    - dnf -y install make
-  tags:
-    - docker
-    - linux
-    - amd64
-
 .build-linux: &build-linux
   <<: *build-base
   tags:
@@ -231,32 +222,31 @@ build-debian-testing-i386:
   image: registry.labs.nic.cz/labs/bird:debian-testing-i386
 
 build-fedora-25-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
   <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-25-amd64
 
 build-fedora-26-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-26-amd64
 
 build-fedora-27-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-27-amd64
 
 build-fedora-28-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-28-amd64
 
 build-fedora-29-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-29-amd64
 
 build-fedora-30-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-30-amd64
 
 build-fedora-31-amd64:
-  <<: [*preprocessing-fedora, *build-linux]
+  <<: *build-linux
   image: registry.labs.nic.cz/labs/bird:fedora-31-amd64
 
 build-centos-7-amd64:
diff --git a/misc/docker/fedora-25-amd64/Dockerfile b/misc/docker/fedora-25-amd64/Dockerfile
index 9cc4c3f6e..d0dd8f6f3 100644
--- a/misc/docker/fedora-25-amd64/Dockerfile
+++ b/misc/docker/fedora-25-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:25
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-26-amd64/Dockerfile b/misc/docker/fedora-26-amd64/Dockerfile
index d1e84439c..f15ba40c9 100644
--- a/misc/docker/fedora-26-amd64/Dockerfile
+++ b/misc/docker/fedora-26-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:26
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-27-amd64/Dockerfile b/misc/docker/fedora-27-amd64/Dockerfile
index 0848216d3..e31745916 100644
--- a/misc/docker/fedora-27-amd64/Dockerfile
+++ b/misc/docker/fedora-27-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:27
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-28-amd64/Dockerfile b/misc/docker/fedora-28-amd64/Dockerfile
index dc4a52cac..0aa2f74a3 100644
--- a/misc/docker/fedora-28-amd64/Dockerfile
+++ b/misc/docker/fedora-28-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:28
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-29-amd64/Dockerfile b/misc/docker/fedora-29-amd64/Dockerfile
index f91497f51..afc1f0c0d 100644
--- a/misc/docker/fedora-29-amd64/Dockerfile
+++ b/misc/docker/fedora-29-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:29
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-30-amd64/Dockerfile
index 16fc2d80b..57561422d 100644
--- a/misc/docker/fedora-30-amd64/Dockerfile
+++ b/misc/docker/fedora-30-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:30
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-31-amd64/Dockerfile
index 95aa06edd..48e410e6d 100644
--- a/misc/docker/fedora-31-amd64/Dockerfile
+++ b/misc/docker/fedora-31-amd64/Dockerfile
@@ -1,6 +1,7 @@
 FROM fedora:31
 RUN dnf -y upgrade
 RUN dnf -y install \
+	make \
 	autoconf \
 	flex \
 	bison \
-- 
2.47.2