Tomishinets Vladimir 4 years ago
parent
commit
3c6592a0b3
2 changed files with 3 additions and 6 deletions
  1. 2 1
      Dockerfile-promo-seo
  2. 1 5
      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 SERVER_PORT=9000
+ARG CONTENT_DIR=web-registration/promo/build/libs
 
 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 ${CONTENT_DIR}/promo-0.0.1-SNAPSHOT.war /
 #COPY version /tmp/
 CMD ["java", "-jar", "/promo-0.0.1-SNAPSHOT.war"]

+ 1 - 5
devK8s.Jenkinsfile

@@ -121,12 +121,8 @@ pipeline {
     stage("Build Image") {
       steps {
         script {
-          sh "chown \$(whoami):\$(whoami) ${BUILD_IMAGE_DIR}"
-          sh "cp ${DOCKER_FILE} ${BUILD_IMAGE_DIR}"
           IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${COMMIT}-${BUILD_NUMBER}"
-          dir (BUILD_IMAGE_DIR) {
-            k8sBuildImage.kaniko(IMAGE_TO_PUSH,,DOCKER_FILE)
-          }
+          k8sBuildImage.kaniko(IMAGE_TO_PUSH,[CONTENT_DIR: BUILD_IMAGE_DIR],DOCKER_FILE)
           // switch (APP_NAME) {
           //   case 'promo-seo':
           //     sh "cp ${BUILD_IMAGE_DIR}/promo-0.0.1-SNAPSHOT.war ."