From 0a161ff25a58aaf703367acd6e16f4eeff8aeb9f Mon Sep 17 00:00:00 2001
From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Thu, 2 Apr 2020 07:52:48 +0200
Subject: [PATCH] Build for Centos 6, 7 & 8 in Docker containers on GitLab
 runners

Also changed to run for all branches.
---
 .gitlab-ci.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f8d389d3..b59ebc516 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,6 @@ portable-source:
         paths:
             - Packages/*/*/*/*/*/*.rpm
             - Packages/*/*/*/*/*.rpm
-    only:
-         - master
 
 .build_template: &deb_build_definition
     stage: build
@@ -72,17 +70,20 @@ portable-source:
 centos6-build:
     <<: *rpm_build_definition
     tags:
-        - graphviz,centos6
+        - linux
+    image: "graphviz/graphviz:centos6"
 
 centos7-build:
     <<: *rpm_build_definition
     tags:
-        - graphviz,centos7
+        - linux
+    image: "graphviz/graphviz:centos7"
 
 centos8-build:
     <<: *rpm_build_definition
     tags:
-        - graphviz,centos8
+        - linux
+    image: "graphviz/graphviz:centos8"
 
           #fedora27-build:
           #<<: *rpm_build_definition
@@ -98,26 +99,36 @@ fedora29-build:
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora29
+    only:
+         - master
 
 fedora30-build:
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora30
+    only:
+         - master
 
 fedora31-build:
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora31
+    only:
+         - master
 
 fedora32-build:
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora32
+    only:
+         - master
 
 fedora33-build:
     <<: *rpm_build_definition
     tags:
         - graphviz,fedora33
+    only:
+         - master
 
 ubuntu18-04-build:
     <<: *deb_build_definition
-- 
2.50.1