From: Arvin Schnell Date: Thu, 18 Jun 2020 08:02:27 +0000 (+0200) Subject: - another try to fix docker-travis-failure X-Git-Tag: v0.8.10~1^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c50d2b69a2af7ed58a045233a605ef618867ea4;p=thirdparty%2Fsnapper.git - another try to fix docker-travis-failure --- diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed index 592d1b81..c4f75fe6 100644 --- a/Dockerfile.tumbleweed +++ b/Dockerfile.tumbleweed @@ -9,7 +9,6 @@ FROM opensuse/${BUILD_FLAVOR} # the NON-OSS repo is not needed, save the network bandwidth and some time (~5 seconds) for each refresh RUN zypper mr -d repo-non-oss - # we need to install Ruby first to define the %{rb_ver} RPM macro # see https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run # https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#/build-cache @@ -18,7 +17,7 @@ RUN zypper --non-interactive in --no-recommends --force-resolution ruby && zyppe # add the YaST repository - we need rubygem-coveralls-lcov RUN zypper ar -f http://download.opensuse.org/repositories/YaST:/Head/openSUSE_Tumbleweed/ yast_tw -RUN zypper ar -f http://download.opensuse.org/repositories/YaST:/Head/openSUSE_Leap_15.1_Update/ yast_lp +RUN zypper ar -f http://download.opensuse.org/repositories/YaST:/Head/openSUSE_Leap_15.2_Update/ yast_lp RUN RUBY_VERSION=ruby:`rpm --eval '%{rb_ver}'` && \ zypper --non-interactive --gpg-auto-import-keys \ in --no-recommends \