Use the Travis script from the base Docker image

yast · Jan 2, 2017 · f431930 · f431930
1 parent fcf2dca
commit f431930
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/.travis.sh b/.travis.sh
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ services:
   - docker
 
 before_install:
-  - docker build -t yast-devel-tw .
+  - docker build -t yast-test-image .
 script:
-  - docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-devel-tw ./.travis.sh
+  # the "yast-travis" is included in the base yastdevel/ruby-tw Docker image
+  - docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-test-image yast-travis
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,3 @@
-FROM yastorg/ruby-tw
+FROM yastdevel/ruby-tw
 COPY . /tmp/sources
-WORKDIR /tmp/sources