Merge c9174b1 into 7ae8c7a

yast · Aug 24, 2017 · 1371b18 · 1371b18
2 parents 7ae8c7a + c9174b1
commit 1371b18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,6 @@ services:
 before_install:
   - docker build -t yast-update-image .
 script:
-  # the "storage-ng-travis-ruby" script is included in the base yastdevel/storage-ng image
-  # see https://github.com/yast/docker-storage-ng/blob/master/storage-ng-travis-ruby
-  #
-  # FIXME: using this special image in Travis is still needed while the merge of
-  # storage-ng and master is not complete. It should be switched to YaST standard
-  # docker image soon.
-  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-update-image storage-ng-travis-ruby
+  # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+  # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-update-image yast-travis-ruby
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,3 @@
-# FIXME: using this special image in Travis is still needed while the merge of
-# storage-ng and master is not complete. It should be switched to YaST standard
-# docker image soon.
-FROM yastdevel/storage-ng
+FROM yastdevel/ruby
 COPY . /usr/src/app