From d1d53ba45ce60658cde7532ef71ec218291c9cd0 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 25 Oct 2016 16:05:07 +0100 Subject: [PATCH] Pre-install more stuff in the image. Install bc and jq in the image rather than on every build. Also pre-pull some Docker images --- bin/circle-dependencies-post | 3 --- test/gce.sh | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/circle-dependencies-post b/bin/circle-dependencies-post index 866f0b9a..2a8e86aa 100755 --- a/bin/circle-dependencies-post +++ b/bin/circle-dependencies-post @@ -2,9 +2,6 @@ set -e -# We need jq to analyse the PR files JSON, so install that first -sudo apt-get -q update && sudo apt-get -q install bc jq - echo "TEST_AND_PUBLISH=1" > "$STATE" if [ -n "$CI_PULL_REQUEST" -a "$CI_PULL_REQUEST" = "$CI_PULL_REQUESTS" ] ; then diff --git a/test/gce.sh b/test/gce.sh index 2c6ce13e..ed3f9530 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -76,13 +76,18 @@ curl -sSL https://get.docker.com/gpg | sudo apt-key add - curl -sSL https://get.docker.com/ | sed -e s/docker-engine/docker-engine=1.11.2-0~xenial/ | sh apt-get update -qq; apt-get install -q -y --force-yes --no-install-recommends ethtool; +apt-get install -q -y bc jq; usermod -a -G docker vagrant; echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H unix:///var/run/alt-docker.sock -H tcp://0.0.0.0:2375 -s overlay"' >> /etc/default/docker; service docker restart EOF # It seems we need a short delay for docker to start up, so I put this in # a separate ssh connection. This installs nsenter. - ssh -t $name sudo docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter + ssh -t $name sudo bash -x -s <