From 252ec1496b50704787b8b1a30d59268f48317775 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Fri, 19 May 2023 04:59:13 +0000
Subject: [PATCH] More updates to get info

---
 Jenkinsfile |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a912359..495a517 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,6 @@
 def customImage
 def discordUrl = "https://discordapp.com/api/webhooks/764667082272145418/vorf2JdFG47WAmQP3yZhgHH12wW_qUXG0bS0SG8INLYVwU0HcDFajq9doaDgi_hnI00-"
+def scmvars
 
 
 pipeline{
@@ -8,11 +9,12 @@
     }
     environment{
         def BUILDDATE = sh(script: "echo `date --rfc-3339=date`", returnStdout: true).trim()
+        def IMAGE_TAG = "${env.BRANCH_NAME != 'master' ? env.BRANCH_NAME : latest }"
     }
     stages{
         stage ('Checkout source'){
             steps{
-                checkout scm
+                scmvars = checkout scm
             }
             post{
                 failure {
@@ -23,6 +25,8 @@
         stage ('Build image'){    
             steps{
                 script{
+                    echo scmvars
+                    echo "$env.BRANCH_NAME $IMAGE_TAG"
                     customImage = docker.build("${JOB_NAME}:${BUILDDATE}-build-${env.BUILD_ID}","--no-cache .")
                 }
             }
@@ -34,12 +38,13 @@
         }
         stage('Push Image'){
            steps{
-               script{
+                input 'Proceed with push'
+                script{
                     docker.withRegistry('https://dev-reg.darkurthe.net'){
                         customImage.push()
-                        customImage.push("latest")
+                        customImage.push("$env.IMAGE_TAG")
                     }
-               }
+                }
             }
             post{
                 failure {

--
Gitblit v1.10.0