diff --git a/Dockerfile b/Dockerfile index 1e3582e50bf11eff42fc7cdb35d57f00e93d721a..973478682602cac1009758f42b5100e0281278cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,13 +24,10 @@ RUN mkdir -p /var/run/sshd # Run install scripts ENV JENKINS_HOME /var/lib/jenkins -ADD init.sh /init.sh ADD install /tmp/install -RUN for INSTALLER in `ls /tmp/install/0*.sh | sort -n`; do /bin/bash $INSTALLER; done && rm -rf /tmp/install +RUN for INSTALLER in `ls /tmp/install/*.sh | sort -n`; do /bin/bash $INSTALLER; done && rm -rf /tmp/install -# Start Jenkins Slave -ENV SWARM_USER jenkins -ENV SWARM_PASSWORD pC4oLhceTFo4fzzVugzZ +# Start SSH Daemon EXPOSE 22 VOLUME ["/var/lib/jenkins"] -CMD ["/bin/bash", "/init.sh"] \ No newline at end of file +CMD ["/usr/sbin/sshd", "-e", "-D"] \ No newline at end of file diff --git a/init.sh b/init.sh deleted file mode 100644 index 2348671ede3df3b31a1fa9d26d74d2a20b85b633..0000000000000000000000000000000000000000 --- a/init.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -set -e # Exit on errors - -# Check if required parameters are set -: ${SWARM_MASTER:?"Please use 'docker run -e SWARM_MASTER=...' to run this container!"} - -echo "-> Starting Jenkins Slave ..." -echo " - SWARM_MASTER: $SWARM_MASTER" -echo " - SWARM_USER: $SWARM_USER" -echo " - SWARM_PASSWORD: $SWARM_PASSWORD" - -/usr/sbin/sshd -su -l $JENKINS_USER --shell=/bin/bash -c "java -jar /var/lib/jenkins/tools/swarm/swarm-client.jar -master $SWARM_MASTER -username $SWARM_USER -password $SWARM_PASSWORD" diff --git a/install/02_swarm_client.sh b/install/02_swarm_client.sh deleted file mode 100644 index f3567acd961313b4de6e39a51d41f31fbdbe8cc6..0000000000000000000000000000000000000000 --- a/install/02_swarm_client.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -e # Exit on errors - -mkdir -p $JENKINS_HOME/tools/swarm -cp ${0%/*}/swarm/swarm-client-1.15-jar-with-dependencies.jar $JENKINS_HOME/tools/swarm/swarm-client.jar -chmod 644 $JENKINS_HOME/tools/swarm/swarm-client.jar diff --git a/install/swarm/swarm-client-1.15-jar-with-dependencies.jar b/install/swarm/swarm-client-1.15-jar-with-dependencies.jar deleted file mode 100644 index 2c2a06d60ef879297aa2b4a173bcde89990c6745..0000000000000000000000000000000000000000 Binary files a/install/swarm/swarm-client-1.15-jar-with-dependencies.jar and /dev/null differ