From: Tomas Krizek Date: Fri, 10 Aug 2018 14:11:02 +0000 (+0200) Subject: .gitlabci: use updated fedora image X-Git-Tag: v3.0.0~8^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d255a81bfba783a7160fa01337a48b004302d858;p=thirdparty%2Fknot-resolver.git .gitlabci: use updated fedora image --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3677a7da6..7bd4a72c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,7 +53,7 @@ srpm: except: - master@knot/knot-resolver allow_failure: true # don't block testing pipeline in case of failure - image: $CI_REGISTRY/knot/knot-resolver/ci:fedora-27 + image: $CI_REGISTRY/knot/knot-resolver/ci/fedora script: - scripts/make-srpm.sh artifacts: @@ -405,7 +405,7 @@ distro:fedora-27: stage: test except: - master@knot/knot-resolver - image: $CI_REGISTRY/knot/knot-resolver/ci:fedora-27 + image: $CI_REGISTRY/knot/knot-resolver/ci/fedora only: - branches@knot/knot-resolver # do not trigger job for forks (no privileged runners) dependencies: @@ -426,7 +426,7 @@ distro:epel-7: stage: test except: - master@knot/knot-resolver - image: $CI_REGISTRY/knot/knot-resolver/ci:fedora-27 + image: $CI_REGISTRY/knot/knot-resolver/ci/fedora only: - branches@knot/knot-resolver # do not trigger job for forks (no privileged runners) dependencies: diff --git a/ci/fedora/Dockerfile b/ci/fedora/Dockerfile index c970ddfbe..a5d2d3d61 100644 --- a/ci/fedora/Dockerfile +++ b/ci/fedora/Dockerfile @@ -4,3 +4,6 @@ WORKDIR "/tmp" CMD ["/bin/bash"] RUN dnf install -y mock rpkg git + +# for scripts/make-distrofiles.sh +RUN dnf install -y dpkg-dev perl-Digest-*