From bc2691df103577eec7b96c619b948a000573a965 Mon Sep 17 00:00:00 2001 From: Konrad Rosenbaum Date: Mon, 20 Mar 2017 22:40:11 +0100 Subject: [PATCH] update docker images for jenkins Change-Id: Ia9862cfed93fd1f68ce96d4839631926e6d25764 --- tests/docker/php7/Dockerfile | 2 +- tests/docker/qtenv/Dockerfile | 2 +- tests/docker/qtenv/start.sh | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/docker/php7/Dockerfile b/tests/docker/php7/Dockerfile index 68f2b1a..6ed4a71 100644 --- a/tests/docker/php7/Dockerfile +++ b/tests/docker/php7/Dockerfile @@ -4,5 +4,5 @@ RUN apt-get update RUN apt-get install -y openjdk-8-jre-headless 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.6 postgresql-client-9.6 apache2 libapache2-mod-php7.0 php7.0-mcrypt php7.0-mysql php7.0-pgsql phpunit +RUN apt-get install -y mariadb-server mariadb-client postgresql-9.6 postgresql-client-9.6 apache2 libapache2-mod-php7.0 php7.0-mcrypt php7.0-mysql php7.0-pgsql phpunit CMD /bin/bash diff --git a/tests/docker/qtenv/Dockerfile b/tests/docker/qtenv/Dockerfile index 8e785ea..946b4ec 100644 --- a/tests/docker/qtenv/Dockerfile +++ b/tests/docker/qtenv/Dockerfile @@ -4,5 +4,5 @@ RUN apt-get update RUN apt-get install -y openjdk-7-jre-headless 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 +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 CMD /bin/bash diff --git a/tests/docker/qtenv/start.sh b/tests/docker/qtenv/start.sh index ec43b5b..66cc201 100755 --- a/tests/docker/qtenv/start.sh +++ b/tests/docker/qtenv/start.sh @@ -7,4 +7,9 @@ rm -f slave.jar wget $1/jnlpJars/slave.jar chmod 644 slave.jar +test -d /home/konrad/.config/qtchooser && { + mkdir -p /jenkins/.config + 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.7.2.5