Update docker on travis using sudo (#616)

This commit is contained in:
jekkos
2016-06-11 20:39:58 +02:00
parent facc25eb74
commit edfd0319a8

View File

@@ -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