Skip to content

Commit 14779ec

Browse files
authored
Merge pull request nginx-proxy#860 from jwilder/jw-travis
Update docker
2 parents 57a33aa + a318b57 commit 14779ec

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
dist: trusty
22
sudo: required
3-
services:
4-
- docker
53

64
env:
7-
global:
8-
- DOCKER_VERSION=1.13.1-0~ubuntu-trusty
95
matrix:
106
- TEST_TARGET: test-debian
117
- TEST_TARGET: test-alpine
128

139
before_install:
14-
# list docker-engine versions
15-
- apt-cache madison docker-engine
16-
# upgrade docker-engine to specific version
17-
- sudo apt-get -o Dpkg::Options::="--force-confnew" install -y --force-yes docker-engine=${DOCKER_VERSION}
10+
- sudo apt-get remove docker docker-engine
11+
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
12+
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
13+
- sudo apt-get update
14+
- sudo apt-get -y install docker-ce
1815
- docker version
1916
- docker info
2017
# prepare docker test requirements

0 commit comments

Comments
 (0)