Tomishinets Vladimir 3 年之前
父節點
當前提交
5d584e768e
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 0 0
      Dockerfile-promo-seo
  2. 2 2
      Jenkinsfile-dev

+ 0 - 0
Dockerfile.promo-seo → Dockerfile-promo-seo


+ 2 - 2
Jenkinsfile-dev

@@ -16,7 +16,7 @@ pipeline {
     SERVICE_NAME_SEO='info_promo-seo'
     DOCKER_IMAGE_SEO='iru/promo-seo'
     GIT_REPO_SEO='git@github.com:icruportal/web-registration.git'
-    DOCKER_FILE_SEO='Dockerfile.promo-seo'
+    DOCKER_FILE_SEO='Dockerfile-promo-seo'
     SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git'
     SWARM_GIT_NAME='stack-deploy'
     JENKINS_MAIL='jenkins@sdsys.ru'
@@ -76,7 +76,7 @@ pipeline {
                   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} -f ./${DOCKER_FILE}"
+          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 = branch + "-" + NEWTAG + "_" + BUILD_NUMBER
           echo "NEWTAG is $NEWTAG"