From 8c344ecaa184ab501a39efaff52310f14c30fd30 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <cpomeroy@zombie-surface.localdomain>
Date: Thu, 18 May 2023 21:26:17 +0000
Subject: [PATCH] Added a check for the image tag

---
 Jenkinsfile |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1d93128..2d58e3e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,7 @@
     }
     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'){
@@ -23,7 +24,7 @@
         stage ('Build image'){    
             steps{
                 script{
-                    customImage = docker.build("${JOB_NAME}:${BUILDDATE}-build-${env.BUILD_ID}","--no-cache")
+                    customImage = docker.build("${JOB_NAME}:${BUILDDATE}-build-${env.BUILD_ID}","--no-cache .")
                 }
             }
             post{
@@ -37,7 +38,7 @@
                script{
                     docker.withRegistry('https://dev-reg.darkurthe.net'){
                         customImage.push()
-                        customImage.push("latest")
+                        customImage.push("$env.IMAGE_TAG")
                     }
                }
             }

--
Gitblit v1.10.0