2 Commits 59bbc17fd1 ... 2105f81796

Author SHA1 Message Date
  Tomishinets Vladimir 2105f81796 Избавление от NODE_IP 3 years ago
  Tomishinets Vladimir 99434fee3f Убрал NODE_IP 3 years ago
2 changed files with 5 additions and 4 deletions
  1. 1 1
      Jenkinsfile.generate
  2. 4 3
      Jenkinsfile.renewal

+ 1 - 1
Jenkinsfile.generate

@@ -29,7 +29,7 @@ pipeline {
           def NODE = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker service ps \${SERVICE_NAME} --format '{{.Node}}' --filter desired-state=Running" , returnStdout: true).trim()
           sh "if [ -z ${NODE} ]; then echo '${SERVICE_NAME} does not running'; exit 1; fi"
           NODE_NAME_LOCAL = NODE.replace(".ru", ".lan")
-          def NODE_IP = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker node inspect ${NODE} -f '{{.Status.Addr}}'" , returnStdout: true).trim()
+          // def NODE_IP = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker node inspect ${NODE} -f '{{.Status.Addr}}'" , returnStdout: true).trim()
           def container_id = sh (script: "DOCKER_HOST=tcp://${NODE_NAME_LOCAL}:2376 DOCKER_TLS_VERIFY=1 docker ps -q -f label=com.docker.swarm.service.name=\${SERVICE_NAME}" , returnStdout: true).trim()
           sh "DOCKER_HOST=tcp://${NODE_NAME_LOCAL}:2376 DOCKER_TLS_VERIFY=1 docker exec -i ${container_id} /tmp/generate.sh ${domain}"
         }

+ 4 - 3
Jenkinsfile.renewal

@@ -28,9 +28,10 @@ pipeline {
         script {
           def NODE = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker service ps \${SERVICE_NAME} --format '{{.Node}}' --filter desired-state=Running" , returnStdout: true).trim()
           sh "if [ -z ${NODE} ]; then echo '${SERVICE_NAME} does not running'; exit 1; fi"
-          def NODE_IP = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker node inspect ${NODE} -f '{{.Status.Addr}}'" , returnStdout: true).trim()
-          def container_id = sh (script: "DOCKER_HOST=tcp://${NODE_IP}:2376 DOCKER_TLS_VERIFY=1 docker ps -q -f label=com.docker.swarm.service.name=\${SERVICE_NAME}" , returnStdout: true).trim()
-          sh "DOCKER_HOST=tcp://${NODE_IP}:2376 DOCKER_TLS_VERIFY=1 docker exec -i ${container_id} /tmp/renewal.sh"
+          NODE_NAME_LOCAL = NODE.replace(".ru", ".lan")
+          // def NODE_IP = sh (script: "DOCKER_HOST=tcp://${CLUSTER_NAME}:2376 DOCKER_TLS_VERIFY=1 docker node inspect ${NODE} -f '{{.Status.Addr}}'" , returnStdout: true).trim()
+          def container_id = sh (script: "DOCKER_HOST=tcp://${NODE_NAME_LOCAL}:2376 DOCKER_TLS_VERIFY=1 docker ps -q -f label=com.docker.swarm.service.name=\${SERVICE_NAME}" , returnStdout: true).trim()
+          sh "DOCKER_HOST=tcp://${NODE_NAME_LOCAL}:2376 DOCKER_TLS_VERIFY=1 docker exec -i ${container_id} /tmp/renewal.sh"
         }
       }
     }