From b4cf6404441c7b930a812299e29644c1e27d0260 Mon Sep 17 00:00:00 2001
From: "John.E.Malmberg" <john.e.malmberg@intel.com>
Date: Mon, 10 Jun 2019 15:15:03 -0500
Subject: [PATCH] CORCI-690 build: OS neutral dockerfile names

Signed-off-by: John.E.Malmberg <john.e.malmberg@intel.com>
---
 Jenkinsfile                                               | 8 ++++----
 utils/docker/{Dockerfile.centos:7 => Dockerfile.centos.7} | 0
 .../{Dockerfile.ubuntu:18.04 => Dockerfile.ubuntu.18.04}  | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename utils/docker/{Dockerfile.centos:7 => Dockerfile.centos.7} (100%)
 rename utils/docker/{Dockerfile.ubuntu:18.04 => Dockerfile.ubuntu.18.04} (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
index 454a1aec..027da231 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -72,7 +72,7 @@ pipeline {
                 stage('checkpatch') {
                     agent {
                         dockerfile {
-                            filename 'Dockerfile.centos:7'
+                            filename 'Dockerfile.centos.7'
                             dir 'utils/docker'
                             label 'docker_runner'
                             additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS'
@@ -100,7 +100,7 @@ pipeline {
                 stage('Build on CentOS 7') {
                     agent {
                         dockerfile {
-                            filename 'Dockerfile.centos:7'
+                            filename 'Dockerfile.centos.7'
                             dir 'utils/docker'
                             label 'docker_runner'
                             additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS'
@@ -128,7 +128,7 @@ pipeline {
                     when { branch 'master' }
                     agent {
                         dockerfile {
-                            filename 'Dockerfile.centos:7'
+                            filename 'Dockerfile.centos.7'
                             dir 'utils/docker'
                             label 'docker_runner'
                             additionalBuildArgs "-t ${sanitized_JOB_NAME}-centos7 " + '$BUILDARGS'
@@ -156,7 +156,7 @@ pipeline {
                 stage('Build on Ubuntu 18.04') {
                     agent {
                         dockerfile {
-                            filename 'Dockerfile.ubuntu:18.04'
+                            filename 'Dockerfile.ubuntu.18.04'
                             dir 'utils/docker'
                             label 'docker_runner'
                             additionalBuildArgs "-t ${sanitized_JOB_NAME}-ubuntu18.04 " + '$BUILDARGS'
diff --git a/utils/docker/Dockerfile.centos:7 b/utils/docker/Dockerfile.centos.7
similarity index 100%
rename from utils/docker/Dockerfile.centos:7
rename to utils/docker/Dockerfile.centos.7
diff --git a/utils/docker/Dockerfile.ubuntu:18.04 b/utils/docker/Dockerfile.ubuntu.18.04
similarity index 100%
rename from utils/docker/Dockerfile.ubuntu:18.04
rename to utils/docker/Dockerfile.ubuntu.18.04