Skip to content

Commit

Permalink
ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ffaerber committed Nov 23, 2017
1 parent acf201a commit 4dab8d7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
25 changes: 23 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
sudo: required
dist: trusty

services:
- docker
install:
# Update docker-engine using Ubuntu 'trusty' apt repo
- >
curl -sSL "https://get.docker.com/gpg" |
sudo -E apt-key add -
- >
echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" |
sudo tee -a /etc/apt/sources.list
- sudo apt-get update
- >
sudo apt-get -o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" --assume-yes install docker-engine
- docker version
# Update docker-compose via pip
- sudo pip install docker-compose
- docker-compose version

before_script:
- docker-compose up --build -d

after_script:
- docker-compose down

env:
matrix:
Expand Down
4 changes: 0 additions & 4 deletions travis-build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash
set -e

echo "Updating Docker engine"
sudo service docker stop
sudo apt-cache madison docker-ce
sudo apt-get install docker-ce=17.11.0~ce-0~ubuntu
docker version

if [ "$ARCH" != "amd64" ]; then
Expand Down

0 comments on commit 4dab8d7

Please sign in to comment.