Browse Source

remove other env

tomishinets.v 6 years ago
parent
commit
92cef78ce6
2 changed files with 3 additions and 5 deletions
  1. 3 3
      Dockerfile
  2. 0 2
      Jenkinsfile

+ 3 - 3
Dockerfile

@@ -9,9 +9,9 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     JAVA_HOME=/usr/java/default \
     JAVA_HOME=/usr/java/default \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
     WORKDIR=$CATALINA_HOME \
     WORKDIR=$CATALINA_HOME \
-    DB_CLUSTER=mongodb \
-    APPNET=labnetwork \
-    ADMIN_HOST=admin-lab
+#    DB_CLUSTER=mongodb \
+#    APPNET=labnetwork \
+#    ADMIN_HOST=admin-lab
 EXPOSE 8090 9000 2551
 EXPOSE 8090 9000 2551
 #HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh
 #HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh
 ARG repo=prod
 ARG repo=prod

+ 0 - 2
Jenkinsfile

@@ -45,14 +45,12 @@ pipeline {
       steps {
       steps {
         echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
         echo "\u001B[32m \u2600 Building \u001B[35m ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}. \u001B[0m"
         sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
         sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ."
-        sh "docker network create -d overlay --attachable labnetwork"
         script {
         script {
            NEWTAG = sh script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true
            NEWTAG = sh script: "docker run --rm ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true
            NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER
            NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER
            echo "NEWTAG is $NEWTAG"
            echo "NEWTAG is $NEWTAG"
         }
         }
         sh "docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
         sh "docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}"
-        
       }
       }
     }
     }
     stage("Publish") {
     stage("Publish") {