File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 11# hadolint global ignore=DL3033,SC3044
2- FROM fedora:20@sha256:5d5a02b873d298da9bca4b84440c5cd698b0832560c850d92cf389cef58bc549
2+ FROM fedora:21
33
44ENV PATH="${PATH}:/root/.cargo/bin/"
55
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ download_and_verify_make() {
8787 curl -L -o " ${BUILDER_DIR} /rsrc/gnu-keyring.gpg" \
8888 " ${GNU_GPG_KEYRING_URL} "
8989 gpg --no-default-keyring --keyring " ${BUILDER_DIR} /rsrc/gnu-keyring.gpg" --import \
90- " ${BUILDER_DIR} /rsrc/gnu-keyring.gpg"
90+ " ${BUILDER_DIR} /rsrc/gnu-keyring.gpg" || true
9191 fi
9292
9393 if [ ! -f " ${BUILDER_DIR} /rsrc/make-4.4.1.tar.gz" ]; then
@@ -222,7 +222,7 @@ download_and_verify_builder_rpms() {
222222 # NOTE: This may stop working at some point, as Fedora 20 is EOL. Therefore, we download the
223223 # packages with the expectation that we will provide them separately if they are no longer
224224 # available.
225- docker run -v " ${BUILDER_DIR} /rsrc/rpms:/rpms" fedora:20 bash -c \
225+ docker run -v " ${BUILDER_DIR} /rsrc/rpms:/rpms" fedora:21 bash -c \
226226 ' yum -y update && yum install --downloadonly --downloaddir=/rpms coreutils gcc gcc-c++ make which && chmod -R 755 /rpms/'
227227 fi
228228}
You can’t perform that action at this time.
0 commit comments