Skip to content

Commit

Permalink
Use the shared Docker image at Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Jan 4, 2017
1 parent b112099 commit 10994d3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 47 deletions.
20 changes: 0 additions & 20 deletions .travis.sh

This file was deleted.

6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ 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" script is included in the base yastdevel/ruby-tw image
# see https://github.com/yast/docker-yast-ruby-tw/blob/master/yast-travis
- docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-test-image yast-travis
26 changes: 1 addition & 25 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
FROM opensuse:tumbleweed
RUN zypper ar -f http://download.opensuse.org/repositories/YaST:/Head/openSUSE_Tumbleweed/ yast
RUN zypper --gpg-auto-import-keys --non-interactive in \
fdupes \
grep \
yast2-devtools \
perl-XML-Writer \
yast2 \
yast2-country-data \
yast2-devtools \
autoyast2-installation \
'rubygem(rspec)' \
'rubygem(yast-rake)' \
augeas-lenses \
'rubygem(cfa)' \
'rubygem(gettext)' \
'rubygem(simplecov)' \
update-desktop-files \
git \
rpm-build \
which
# FIXME: fix the dependency issues in YaST:Head and install them via zypper
# FIXME: switch to Rubocop 0.41.2 as the rest of YaST
RUN gem install --no-document coveralls yard rubocop:0.29.1
FROM yastdevel/ruby-tw
COPY . /tmp/sources
WORKDIR /tmp/sources

0 comments on commit 10994d3

Please sign in to comment.