From d25b04d44aedc87860cfded740b5d09a53837e4f Mon Sep 17 00:00:00 2001
From: Jesse James Isler <jesse.isler@gmail.com>
Date: Thu, 9 Jun 2022 10:06:50 +0200
Subject: [PATCH] Cleaning up

---
 Jenkinsfile | 80 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 31 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6a7d882..439da9c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,22 +1,37 @@
-//pipeline {
-//    agent { dockerfile true }
-//    stages {
-//        stage('Test') {
-//            steps {
-//                echo "Build has worked!"
-//            }
-//        }
-//    }
-//}
+/*
+//Original Pipeline
+
+pipeline {
+    agent { dockerfile true }
+    stages {
+        stage('Test') {
+            steps {
+                echo "Build has worked!"
+            }
+        }
+    }
+}
+*/
+
+//New Pipeline
+
 pipeline {
   agent none
-//  tools {
-//    nodejs "815Node"
-//  }
-  //  environment {
-  //    registry = 'dockerhubusername/dockerhubusername'
-  //    registryCredential = 'dockerhubcredentials'
-  //  }
+/*
+//For some reason, this scrashes Jenkins
+
+  tools {
+    nodejs "815Node"
+  }
+*/
+
+/* We won't be Pushing to Dockerhub YET
+  environment {
+    registry = 'dockerhubusername/dockerhubusername'
+    registryCredential = 'dockerhubcredentials'
+  }
+*/
+
   stages {
     stage('INSTALL PACKAGES') {
       agent any
@@ -54,19 +69,22 @@ pipeline {
         }
       }
     }
-    //     stage("DEPLOY DOCKER") {
-    //       steps {
-    //          script {
-    //            docker.withRegistry('', registryCredential) {
-    //              dockerImageBuild.push()
-    //            }
-    //         }
-    //      }
-    //   }
-    //    stage("DEPLOY & ACTIVATE") {
-    //      steps {
-    //        echo 'this part will differ depending on setup'
-    //      }
-    //    }
+/*
+// Again, no pushing to Docker Hub
+
+     stage("DEPLOY DOCKER") {
+       steps {
+          script {
+            docker.withRegistry('', registryCredential) {
+              dockerImageBuild.push()
+            }
+         }
+      }
+   }
+    stage("DEPLOY & ACTIVATE") {
+      steps {
+        echo 'this part will differ depending on setup'
+      }
+    }
   }
 }