diff --git a/contrib/builder/rpm/amd64/fedora-25/Dockerfile b/contrib/builder/rpm/amd64/fedora-25/Dockerfile index 2b03b555bc..c80a4deb1e 100644 --- a/contrib/builder/rpm/amd64/fedora-25/Dockerfile +++ b/contrib/builder/rpm/amd64/fedora-25/Dockerfile @@ -2,7 +2,7 @@ # THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"! # -FROM andrewh5u/fedora-docker-base-25_beta:1.1 +FROM fedora:25 RUN dnf install -y @development-tools fedora-packager RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common diff --git a/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh index d4091491f9..895837e3c8 100755 --- a/contrib/builder/rpm/amd64/generate.sh +++ b/contrib/builder/rpm/amd64/generate.sh @@ -23,11 +23,6 @@ for version in "${versions[@]}"; do from="${distro}:${suite}" installer=yum - # TODO remove when offical image is available - if [[ "$from" == "fedora:25" ]]; then - from="andrewh5u/fedora-docker-base-25_beta:1.1" - fi - if [[ "$distro" == "fedora" ]]; then installer=dnf fi