diff --git a/Jenkinsfile b/Jenkinsfile index dbc13ef..18652d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,10 +29,11 @@ pipeline { exit 1 fi - echo "$VERSION" + echo $VERSION ''', returnStdout: true ).trim() + echo env.VERSION } } } @@ -60,16 +61,15 @@ pipeline { ''' def REPO_NAME = "${env.PRODUCT_GROUP.toLowerCase()}/${env.PRODUCT_NAME.toLowerCase()}" sh 'echo $VERSION' - env.VERSION = sh('echo $VERSION') - def appImage = "${env.REGISTRY}/${REPO_NAME}:$VERSION" + def appImage = "${env.REGISTRY}/${REPO_NAME}:${env.VERSION}" sh "docker build -t ${appImage} -f build/docker/Dockerfile ." sh "docker push ${appImage}" - def rdbImage = "${env.REGISTRY}/${REPO_NAME}-db:$VERSION" + def rdbImage = "${env.REGISTRY}/${REPO_NAME}-db:${env.VERSION}" sh "docker build -t ${rdbImage} -f build/rdbDocker/Dockerfile ." sh "docker push ${rdbImage}" - def udbImage = "${env.REGISTRY}/${REPO_NAME}-update-db:$VERSION" + def udbImage = "${env.REGISTRY}/${REPO_NAME}-update-db:${env.VERSION}" sh "docker build -t ${udbImage} -f build/docker-tools/uD/Dockerfile ." sh "docker push ${udbImage}"