|
@@ -16,6 +16,7 @@ pipeline {
|
|
SERVICE_NAME_SEO='info_promo-seo'
|
|
SERVICE_NAME_SEO='info_promo-seo'
|
|
DOCKER_IMAGE_SEO='iru/promo-seo'
|
|
DOCKER_IMAGE_SEO='iru/promo-seo'
|
|
GIT_REPO_SEO='git@github.com:icruportal/web-registration.git'
|
|
GIT_REPO_SEO='git@github.com:icruportal/web-registration.git'
|
|
|
|
+ DOCKER_FILE_SEO='Dockerfile.promo-seo'
|
|
SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git'
|
|
SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git'
|
|
SWARM_GIT_NAME='stack-deploy'
|
|
SWARM_GIT_NAME='stack-deploy'
|
|
JENKINS_MAIL='jenkins@sdsys.ru'
|
|
JENKINS_MAIL='jenkins@sdsys.ru'
|
|
@@ -50,11 +51,13 @@ pipeline {
|
|
REPO=GIT_REPO_SDK
|
|
REPO=GIT_REPO_SDK
|
|
DOCKER_IMAGE=DOCKER_IMAGE_SDK
|
|
DOCKER_IMAGE=DOCKER_IMAGE_SDK
|
|
SERVICE_NAME=SERVICE_NAME_SDK
|
|
SERVICE_NAME=SERVICE_NAME_SDK
|
|
|
|
+ DOCKER_FILE=DOCKER_FILE_SDK
|
|
break
|
|
break
|
|
case 'promo-seo':
|
|
case 'promo-seo':
|
|
REPO=GIT_REPO_SEO
|
|
REPO=GIT_REPO_SEO
|
|
DOCKER_IMAGE=DOCKER_IMAGE_SEO
|
|
DOCKER_IMAGE=DOCKER_IMAGE_SEO
|
|
SERVICE_NAME=SERVICE_NAME_SEO
|
|
SERVICE_NAME=SERVICE_NAME_SEO
|
|
|
|
+ DOCKER_FILE=DOCKER_FILE_SEO
|
|
break
|
|
break
|
|
}
|
|
}
|
|
echo REPO
|
|
echo REPO
|
|
@@ -73,7 +76,7 @@ pipeline {
|
|
chmod 600 ${WORKSPACE}/id_rsa
|
|
chmod 600 ${WORKSPACE}/id_rsa
|
|
"""
|
|
"""
|
|
}
|
|
}
|
|
- sh "docker build --build-arg branch=${branch} --build-arg git_repo=${REPO} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} ."
|
|
|
|
|
|
+ sh "docker build --build-arg branch=${branch} --build-arg git_repo=${REPO} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} -f ${DOCKER_FILE}"
|
|
NEWTAG = sh(script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} cat /tmp/version 2> /dev/null", returnStdout: true).trim()
|
|
NEWTAG = sh(script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${BUILD_NUMBER} cat /tmp/version 2> /dev/null", returnStdout: true).trim()
|
|
NEWTAG = branch + "-" + NEWTAG + "_" + BUILD_NUMBER
|
|
NEWTAG = branch + "-" + NEWTAG + "_" + BUILD_NUMBER
|
|
echo "NEWTAG is $NEWTAG"
|
|
echo "NEWTAG is $NEWTAG"
|