From d226c7bed590cfbcca6009154f9da50229d90a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Hedenstr=C3=B6m?= <erik@codemate.se> Date: Thu, 13 Mar 2014 15:50:01 +0100 Subject: [PATCH] Added chromedriver --- Dockerfile | 3 --- install/01_jenkins_user.sh | 3 +++ install/10_build_essential.sh | 3 --- install/11_docker.sh | 3 +-- install/12_chrome_xvfb.sh | 11 +++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2b5734..36cff8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,9 +11,6 @@ ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_PRIORITY critical ENV DEBCONF_NOWARNINGS yes -# Fix locale -RUN locale-gen en_US.UTF-8 - # Install OpenSSH Server RUN apt-get install -y openssh-server RUN mkdir -p /var/run/sshd diff --git a/install/01_jenkins_user.sh b/install/01_jenkins_user.sh index 0353e1c..a15237c 100755 --- a/install/01_jenkins_user.sh +++ b/install/01_jenkins_user.sh @@ -21,3 +21,6 @@ echo "AllowAgentForwarding yes" >> /etc/ssh/sshd_config # Create tool dir mkdir -p $JENKINS_HOME/tools + +echo "export JENKINS_HOME=$JENKINS_HOME" > /etc/profile.d/jenkins.sh +chmod 755 /etc/profile.d/jenkins.sh diff --git a/install/10_build_essential.sh b/install/10_build_essential.sh index 498b67d..2f3df39 100755 --- a/install/10_build_essential.sh +++ b/install/10_build_essential.sh @@ -2,8 +2,5 @@ set -e # Exit on errors -echo "deb http://security.ubuntu.com/ubuntu quantal-security main " >> /etc/apt/sources.list - -apt-get update apt-get -y install build-essential checkinstall apt-get -y install cvs subversion git-core mercurial diff --git a/install/11_docker.sh b/install/11_docker.sh index 92e3ef7..d7ac6ca 100755 --- a/install/11_docker.sh +++ b/install/11_docker.sh @@ -6,6 +6,5 @@ mkdir -p $JENKINS_HOME/tools/docker/bin curl -s https://get.docker.io/builds/Linux/x86_64/docker-latest -o $JENKINS_HOME/tools/docker/bin/docker chmod 755 $JENKINS_HOME/tools/docker/bin/docker -DOCKER_HOME=$JENKINS_HOME/tools/docker -echo "export PATH=$DOCKER_HOME/bin:\$PATH" > /etc/profile.d/docker.sh +echo "export PATH=$JENKINS_HOME/tools/docker/bin:\$PATH" > /etc/profile.d/docker.sh chmod 755 /etc/profile.d/docker.sh diff --git a/install/12_chrome_xvfb.sh b/install/12_chrome_xvfb.sh index 3475864..4aba82f 100644 --- a/install/12_chrome_xvfb.sh +++ b/install/12_chrome_xvfb.sh @@ -7,3 +7,14 @@ echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources apt-get update apt-get -y install x11vnc xvfb fluxbox google-chrome-stable + +LATEST_RELEASE=`curl -s http://chromedriver.storage.googleapis.com/LATEST_RELEASE` + +mkdir -p $JENKINS_HOME/tools/chromedriver/bin +curl -s http://chromedriver.storage.googleapis.com/${LATEST_RELEASE}/chromedriver_linux64.zip -o /tmp/chromedriver_linux64.zip +unzip -o /tmp/chromedriver_linux64.zip -d $JENKINS_HOME/tools/chromedriver/bin +rm /tmp/chromedriver_linux64.zip +chmod 755 $JENKINS_HOME/tools/chromedriver/bin/chromedriver + +echo "export PATH=$JENKINS_HOME/tools/docker/bin:\$PATH" > /etc/profile.d/chromedriver.sh +chmod 755 /etc/profile.d/chromedriver.sh -- GitLab