From 11354f0fb2b64d5a54a1203d6cc8c9b62a40be6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 10 Jan 2017 08:53:55 +0100 Subject: [PATCH] Use the new Docker image at Travis --- .travis.yml | 4 ++-- Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c175778..d33626d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -language: ruby +language: bash services: - docker @@ -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 diff --git a/Dockerfile b/Dockerfile index c0ce824f..8675e13d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ -FROM yastdevel/cpp-tw -COPY . /tmp/sources +FROM yastdevel/cpp +COPY . /usr/src/app