Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Split Docker install and login/pull/build into install and `before_…
Browse files Browse the repository at this point in the history
…script` sections. Remove unnecessary information-only commands.
  • Loading branch information
mrmachine committed Aug 31, 2016
1 parent 9489b2e commit eaee56d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
sudo: required

language: python

services:
- docker

before_install:
install:
# Update apt sources. See: https://docs.docker.com/engine/installation/linux/ubuntulinux/
- sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
- echo 'deb https://apt.dockerproject.org/repo ubuntu-trusty main' | sudo tee /etc/apt/sources.list.d/docker.list
Expand All @@ -16,18 +18,15 @@ before_install:
- curl -L https://github.com/docker/compose/releases/download/1.7.0/docker-compose-`uname -s`-`uname -m` | sudo tee /usr/local/bin/docker-compose > /dev/null
- sudo chmod +x /usr/local/bin/docker-compose

# Login and build images.
before_script:
- docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
- docker pull "interaction/icekit:${TAG}" || true
- docker build -t "interaction/icekit:${TAG}" .
- docker-compose -f docker-compose.travis.yml config

script:
- docker-compose -f docker-compose.travis.yml run --rm django

after_success:
- docker history "interaction/icekit:${TAG}"
- docker images
- docker push "interaction/icekit:${TAG}"

env:
Expand Down

0 comments on commit eaee56d

Please sign in to comment.