From f9ac0c8480dd9b45a0fcf0693ced042eb82df2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20Gr=C3=BCnewaldt?= Date: Mon, 31 Jul 2017 19:34:51 +0200 Subject: [PATCH] Update docker-entrypoint.sh --- docker-entrypoint.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 576508d..22f6a3d 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -70,8 +70,11 @@ curl -sSLo /tmp/jenkins-slave.jar https://repo.jenkins-ci.org/releases/org/jenk ###echo "DOCKER-ENTRYPOINT >> checking integrity of slave.jar" ###jar -tvf /tmp/jenkins-slave.jar -echo "DOCKER-ENTRYPOINT >> establishing JNLP connection with Jenkins" -exec java $JAVA_OPTS -cp /tmp/jenkins-slave.jar \ - hudson.remoting.jnlp.Main -headless \ - -jnlpUrl $JENKINS_JNLP_URL $JENKINS_SECRET $JENKINS_NAME +echo "DOCKER-ENTRYPOINT >> establishing JNLP connection with Jenkins via JNLP URL" +echo "DOCKER-ENTRYPOINT >> java -jar /tmp/jenkins-slave.jar -jnlpUrl $JENKINS_JNLP_URL" +#exec java $JAVA_OPTS -cp /tmp/jenkins-slave.jar \ +# hudson.remoting.jnlp.Main -headless \ +# -jnlpUrl $JENKINS_JNLP_URL $JENKINS_SECRET $JENKINS_NAME + +exec java -jar /tmp/jenkins-slave.jar -jnlpUrl $JENKINS_JNLP_URL