Tomishinets Vladimir 4 年 前
コミット
09db0629bd
2 ファイル変更7 行追加9 行削除
  1. 2 1
      Dockerfile-promo-seo
  2. 5 8
      devK8s.Jenkinsfile

+ 2 - 1
Dockerfile-promo-seo

@@ -1,8 +1,9 @@
 FROM openjdk:8-jre
 ARG DB_CLUSTER=mongodb1:27017,mongodb2:27018,mongodb3:27019
+ARG DIR_WAR=web-registration/promo/build/libs
 ARG SERVER_PORT=9000
 
 HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD curl -f 127.0.0.1:${SERVER_PORT} || exit 1
-COPY promo-0.0.1-SNAPSHOT.war /
+COPY ${DIR_WAR}/promo-0.0.1-SNAPSHOT.war /
 COPY version /tmp/
 CMD ["java", "-jar", "/promo-0.0.1-SNAPSHOT.war"]

+ 5 - 8
devK8s.Jenkinsfile

@@ -120,14 +120,11 @@ pipeline {
       steps {
         script {
           sh "ls -al ${BUILD_IMAGE_DIR}"
-          sh "cp ${WORKSPACE}/${DOCKER_FILE} ${BUILD_IMAGE_DIR}"
-          dir(BUILD_IMAGE_DIR) {
-            COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
-            IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
-            // sh "cp ${WORKSPACE}/${DOCKER_FILE} ."
-            echo "Build ${IMAGE_TO_PUSH} with Kaniko"
-            k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
-          }
+          COMMIT = sh(script: "cat version 2> /dev/null", returnStdout: true).trim()
+          IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
+          // sh "cp ${WORKSPACE}/${DOCKER_FILE} ."
+          echo "Build ${IMAGE_TO_PUSH} with Kaniko"
+          k8sBuildImage.kaniko(IMAGE_TO_PUSH,[ DIR_WAR: BUILD_IMAGE_DIR ],DOCKER_FILE)
         }
       }
     }