Skip to content

Commit

Permalink
Merge pull request #189 from yast/travis_update
Browse files Browse the repository at this point in the history
Use the new Docker image at Travis
  • Loading branch information
lslezak committed Jan 16, 2017
2 parents 436e8a1 + 11354f0 commit acbab85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,5 +1,5 @@
sudo: required
language: ruby
language: bash
services:
- docker

Expand All @@ -8,4 +8,4 @@ before_install:
script:
# the "yast-travis-cpp" script is included in the base yastdevel/cpp-tw image
# see https://github.com/yast/docker-yast-cpp-tw/blob/master/yast-travis-cpp
- docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ruby-bindings-image yast-travis-cpp
- docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ruby-bindings-image yast-travis-cpp
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,2 +1,2 @@
FROM yastdevel/cpp-tw
COPY . /tmp/sources
FROM yastdevel/cpp
COPY . /usr/src/app

0 comments on commit acbab85

Please sign in to comment.