|
|
@@ -76,7 +76,7 @@ pipeline {
|
|
|
gitOps.checkout(SOURCE_DIR, branch)
|
|
|
echo "Save Version"
|
|
|
dir(SOURCE_DIR) {
|
|
|
- sh 'echo $(git log -p -1 --pretty=format:"%h"|head -n1) > version'
|
|
|
+ COMMIT = sh(script: 'echo $(git log -p -1 --pretty=format:"%h"|head -n1)', returnStdout: true).trim()
|
|
|
}
|
|
|
HELM_DIR = dirOps.calculateDir(HELM_GIT_URL)
|
|
|
CHART_PATH = HELM_DIR + "/helm/"+ DOCKER_IMAGE.split("/")[0]
|
|
|
@@ -124,7 +124,7 @@ pipeline {
|
|
|
switch (APP_NAME) {
|
|
|
case 'promo-seo':
|
|
|
sh "cp ${BUILD_IMAGE_DIR}/promo-0.0.1-SNAPSHOT.war ."
|
|
|
- COMMIT = sh(script: "cat ${SOURCE_DIR}version 2> /dev/null", returnStdout: true).trim()
|
|
|
+ // COMMIT = sh(script: "cat ${SOURCE_DIR}version 2> /dev/null", returnStdout: true).trim()
|
|
|
IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
|
|
|
echo "Build ${IMAGE_TO_PUSH} with Kaniko"
|
|
|
k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
|
