From bf34d4a9462ed8756a3081326dfdf7e25c72a70a Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 5 Apr 2020 22:05:02 -0400
Subject: [PATCH] rewrite php Jenkinsfile

---
 dockerfiles/tasks/JenkinsCli/Dockerfile | 19 +++++++
 dockerfiles/tasks/JenkinsCli/build.sh   |  6 +++
 dockerfiles/tasks/php/Jenkinsfile       | 69 +++++++++++++------------
 3 files changed, 60 insertions(+), 34 deletions(-)
 create mode 100644 dockerfiles/tasks/JenkinsCli/Dockerfile
 create mode 100755 dockerfiles/tasks/JenkinsCli/build.sh

diff --git a/dockerfiles/tasks/JenkinsCli/Dockerfile b/dockerfiles/tasks/JenkinsCli/Dockerfile
new file mode 100644
index 0000000..5abc00f
--- /dev/null
+++ b/dockerfiles/tasks/JenkinsCli/Dockerfile
@@ -0,0 +1,19 @@
+FROM openjdk:8
+MAINTAINER r.morgan105@mail.com
+
+
+RUN curl https://jenkins.xai-corp.net/jnlpJars/jenkins-cli.jar -o /usr/local/bin/jenkins-cli.jar \
+ && chmod +x /usr/local/bin/jenkins-cli.jar
+
+ENTRYPOINT [\
+    "java",\
+    "-jar",\
+    "/usr/local/bin/jenkins-cli.jar",\
+    "-s",\
+    "http://jenkins.xai-corp.net:8080/",\
+    "-webSocket",\
+    "-auth",\
+    "richard:110768be7c9cd91ec076fb14fe4f17463f"\
+]
+
+CMD ["declarative-linter", "<", "/opt/project/Jenkinsfile"]
diff --git a/dockerfiles/tasks/JenkinsCli/build.sh b/dockerfiles/tasks/JenkinsCli/build.sh
new file mode 100755
index 0000000..0283a1e
--- /dev/null
+++ b/dockerfiles/tasks/JenkinsCli/build.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+
+docker build --rm -f Dockerfile -t xaicorp/jenkins-cli .
+#docker run --rm xaicorp/jenkins-cli --version | grep 'ansible 2.0.'
+#docker tag xaicorp/jenkins-cli dkregistry.xai-corp.net:5000/xaicorp/jenkins-cli
diff --git a/dockerfiles/tasks/php/Jenkinsfile b/dockerfiles/tasks/php/Jenkinsfile
index dd690db..7140667 100644
--- a/dockerfiles/tasks/php/Jenkinsfile
+++ b/dockerfiles/tasks/php/Jenkinsfile
@@ -1,3 +1,5 @@
+def workdir = "dockerfiles/tasks/php"
+
 pipeline {
     agent { label 'docker' }
     triggers {
@@ -7,47 +9,46 @@ pipeline {
         disableConcurrentBuilds()
         buildDiscarder(logRotator(numToKeepStr: '2'))
     }
+
     stages {
-//         stage('Build Images') {
-//             steps {
-//                 build job:
-//                     '_build_image',
-//                     parameters: [
-//                         string(name: 'IMAGE', value: 'php'),
-//                         string(name: 'VERSION', value: '7.2')
-//                     ],
-//                     quietPeriod: 1
-//             }
-//         }
-
-        def workdir = "dockerfiles/tasks/php"
-
-        stage('Build PHP Images') {
-            parallel php70 {
-                def version = "7.0"
-                def dockerfile = "Dockerfile-70"
-                dir(workdir) {
-                    docker.withRegistry('http://dkregistry.xai-corp.net:5000') {
-                        def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .")
-                        customImage.inside() {
-                            sh "php --version | grep 'PHP 7.1'"
+        stage('Build PHP Images in Parallel') {
+            failFast false
+            parallel {
+                stage("php70") {
+                    steps {
+                        script {
+                            def version = "7.0"
+                            def dockerfile = "Dockerfile-70"
+                            dir(workdir) {
+                                docker.withRegistry('http://dkregistry.xai-corp.net:5000') {
+                                    def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .")
+                                    customImage.inside() {
+                                        sh "php --version | grep 'PHP 7.1'"
+                                    }
+                                    customImage.push()
+                                }
+                            }
                         }
-                        customImage.push()
                     }
                 }
-            }, php71 {
-                def version = "7.1"
-                def dockerfile = "Dockerfile-71"
-                dir(workdir) {
-                    docker.withRegistry('http://dkregistry.xai-corp.net:5000') {
-                        def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .")
-                        customImage.inside() {
-                            sh "php --version | grep 'PHP 7.1'"
+                stage ("php71") {
+                    steps {
+                        script {
+                            def version = "7.1"
+                            def dockerfile = "Dockerfile-71"
+                            dir(workdir) {
+                                docker.withRegistry('http://dkregistry.xai-corp.net:5000') {
+                                    def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .")
+                                    customImage.inside() {
+                                        sh "php --version | grep 'PHP 7.1'"
+                                    }
+                                    customImage.push()
+                                }
+                            }
                         }
-                        customImage.push()
                     }
                 }
-            }, failFast: false
+            }
         }
     }
 }