From edfd0319a8b6cc24944a7cebd50000dd21f331c5 Mon Sep 17 00:00:00 2001 From: jekkos Date: Sat, 11 Jun 2016 20:39:58 +0200 Subject: [PATCH] Update docker on travis using sudo (#616) --- .travis.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92606f1cd..8bc318c74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,30 +3,18 @@ sudo: true # Required to install packages services: - docker -env: - global: - - DOCKER_VERSION=1.10.3 # Install Docker version 1.10.3 - - DOCKER_COMPOSE_VERSION=1.7.1 - - DOCKER_VERSION=get.docker.com # Install Docker using get.docker.com (may break) - - - BRANCH=stable # Use 'stable' branch - - BRANCH=develop # Use 'develop' branch - - - QUIET=1 # Less verbose logging - - UML_FIG=0 # Don't install fig - - UML_DOCKERCOMPOSE=1 # Install docker-compose - - install: - # Install https://github.com/moul/travis-docker toolchain - # - curl -sLo - http://j.mp/install-travis-docker | sh -xe before_install: + - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list' + - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + - sudo apt-get update + - sudo apt-key update + - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise - sudo rm /usr/local/bin/docker-compose - - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - - docker-compose build - - docker-compose up -d - + - docker-compose -v + - docker -v script: - docker-wait opensourcepos_php_1