bird: dockerfiles were fixed (fedora)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f25211c6258210247c3c7f94a0eb630e111054c..0d4c6e715392d1a4d0900b2a89ab80651d9f1758 100644 (file)
--- 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 9cc4c3f6ed07c9a5e5ba787d008a4f45ca957d97..d0dd8f6f36a8e4d7e57317c503376bdd5eec1da1 100644 (file)
--- 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 d1e84439ca8934beded18a5df83255a615d5a886..f15ba40c9af0c3807f8dcd557e19264b81613a4d 100644 (file)
--- 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 0848216d3e5d237fa7c496d1f381491073caa27b..e3174591697701f7a7603c2a8b8ec2f1ac96da40 100644 (file)
--- 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 dc4a52cac323ec493bde7cbfbd0b3bb80398fa40..0aa2f74a3103c1b3bb35ae8ad2f449f737360140 100644 (file)
--- 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 f91497f5121154cccfb3f1632e3d0845d67eb281..afc1f0c0dc3fdfa2ff8d210e47f7fb770991c48f 100644 (file)
--- 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 16fc2d80bc2f2cff8636dd3d08ee711f5a613257..57561422d71ec0e82074cd835d3b3e40dd824856 100644 (file)
--- 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 95aa06edda4a0f4ae1e7eca8f247dbb8c377dc81..48e410e6db9e61febec5f3dce77139ccf895b64e 100644 (file)
--- 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 \