Use official fedora 25 image

Fedora 25 was released today, and the official
image will be available soon.

This removes the temporary override, so that
we can build using the official image.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 545a2f009e5d99a196d1a328f4861207f8a99107
Component: engine

components/engine/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

components/engine/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