From: Konrad Rosenbaum <konrad@silmor.de>
Date: Fri, 22 Dec 2017 12:00:34 +0000 (+0100)
Subject: upgrade docker definition for current jenkins
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=1a25d6dc05b5be8953d40c959b9773d7f7d9f2fe;p=web%2Fkonrad%2Fsmoke.git

upgrade docker definition for current jenkins

Change-Id: I7ec79dc2ac7b036bce8e01a20bb3371ee12df9ec
---

diff --git a/tests/docker/php5/Dockerfile b/tests/docker/php5/Dockerfile
index 2ed7d5c..dcd3cd2 100644
--- a/tests/docker/php5/Dockerfile
+++ b/tests/docker/php5/Dockerfile
@@ -1,8 +1,9 @@
 FROM debian:jessie
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
-RUN apt-get install -y openjdk-7-jre-headless wget git
+RUN apt-get install -y wget git
 RUN useradd -d /jenkins -m -s /bin/bash -u 12001 -U jenkins
 COPY start.sh /jenkins
 RUN apt-get install -y mysql-server mysql-client postgresql-9.4 postgresql-client-9.4 apache2 libapache2-mod-php5 php5-mcrypt php5-mysql php5-pgsql phpunit
+RUN echo deb http://ftp.de.debian.org/debian jessie-backports main contrib >>/etc/apt/sources.list ; apt-get update ; apt-get install -y -t jessie-backports openjdk-8-jre-headless
 CMD /bin/bash
diff --git a/tests/docker/php5/start.sh b/tests/docker/php5/start.sh
index f4c9cd5..7123c7c 100755
--- a/tests/docker/php5/start.sh
+++ b/tests/docker/php5/start.sh
@@ -29,4 +29,4 @@ rm -f slave.jar
 wget $1/jnlpJars/slave.jar
 chmod 644 slave.jar
 
-su jenkins -c "nice java -jar slave.jar"
+su jenkins -c "nice java -jar slave.jar -jnlpUrl $1/computer/$2/slave-agent.jnlp -jnlpCredentials $3"
diff --git a/tests/docker/php7/start.sh b/tests/docker/php7/start.sh
index f4c9cd5..7123c7c 100755
--- a/tests/docker/php7/start.sh
+++ b/tests/docker/php7/start.sh
@@ -29,4 +29,4 @@ rm -f slave.jar
 wget $1/jnlpJars/slave.jar
 chmod 644 slave.jar
 
-su jenkins -c "nice java -jar slave.jar"
+su jenkins -c "nice java -jar slave.jar -jnlpUrl $1/computer/$2/slave-agent.jnlp -jnlpCredentials $3"
diff --git a/tests/docker/qtenv/Dockerfile b/tests/docker/qtenv/Dockerfile
index 946b4ec..fa57f52 100644
--- a/tests/docker/qtenv/Dockerfile
+++ b/tests/docker/qtenv/Dockerfile
@@ -1,8 +1,9 @@
 FROM debian:jessie
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
-RUN apt-get install -y openjdk-7-jre-headless wget git
+RUN apt-get install -y wget git
 RUN useradd -d /jenkins -m -s /bin/bash -u 12001 -U jenkins
 COPY start.sh /jenkins
 RUN apt-get install -y libfontconfig1 libfreetype6 libx11-6 libxext6 libxfixes3 libxi6 libsm6 libice6 libdbus-1-3 libxrender1 libxcb1 libx11-xcb1 libxcb-glx0 libglib2.0-0 libstdc++6 zlib1g-dev libgcc1 libpcre3 libegl1-mesa libgl1-mesa-glx libgl1-mesa-dev libuuid1 libxau6 libxdmcp6 libexpat1 libpng12-0 libgbm1 libdrm2 libglapi-mesa libffi6 libudev-dev g++ gcc make doxygen qtchooser chrpath patchelf zip autoconf automake gettext
+RUN echo deb http://ftp.de.debian.org/debian jessie-backports main contrib >>/etc/apt/sources.list ; apt-get update ; apt-get install -y -t jessie-backports openjdk-8-jre-headless
 CMD /bin/bash
diff --git a/tests/docker/qtenv/start.sh b/tests/docker/qtenv/start.sh
index 58aeca8..1a32419 100755
--- a/tests/docker/qtenv/start.sh
+++ b/tests/docker/qtenv/start.sh
@@ -12,4 +12,4 @@ test -d /home/konrad/.config/qtchooser && {
 	ln -sf /home/konrad/.config/qtchooser /jenkins/.config/qtchooser
 	echo "Just Linked Qt-Chooser Dir."
 } || echo "Qt-Chooser Dir not Found, not Linking it."
-su jenkins -c "nice java -jar slave.jar $1/computer/$2/slave-agent.jnlp"
+su jenkins -c "nice java -jar slave.jar -jnlpUrl $1/computer/$2/slave-agent.jnlp -jnlpCredentials $3"