Skip to content

Commit

Permalink
adapt Rakefile and Dockerfile for SLE-15-GA
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Apr 23, 2018
1 parent c49ca4b commit f88a278
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM yastdevel/ruby
FROM yastdevel/ruby:sle15
COPY . /usr/src/app
# a workaround to allow package building on a non-s390 machine
RUN sed -i "/^ExclusiveArch:/d" package/*.spec
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
@@ -1,5 +1,7 @@
require "yast/rake"

Yast::Tasks.submit_to :sle15

# do nothing in osc:build as it can be builds exclusivelly on s390
Rake::Task["osc:build"].clear_actions if `uname --machine` !~ /s390/

Expand Down

0 comments on commit f88a278

Please sign in to comment.