Merge pull request #28222 from thaJeztah/add-fedora-25

Add Fedora 25 RPMs

contrib/builder/rpm/amd64/fedora-25/Dockerfile

@@ -0,0 +1,18 @@
+#
+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
+#
+
+FROM andrewh5u/fedora-docker-base-25_beta:1.1
+
+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
+
+ENV GO_VERSION 1.7.3
+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
+ENV PATH $PATH:/usr/local/go/bin
+
+ENV AUTO_GOPATH 1
+
+ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
+ENV RUNC_BUILDTAGS seccomp selinux
+

contrib/builder/rpm/amd64/generate.sh

@@ -22,6 +22,12 @@ for version in "${versions[@]}"; do
 	suite="${version##*-}"
 	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

hack/make/.build-rpm/docker-engine.spec

@@ -24,10 +24,16 @@ Packager: Docker <support@docker.com>
 BuildRequires: systemd-rpm-macros
 %{?systemd_requires}
 %else
+%if 0%{?fedora} >= 25
+# Systemd 230 and up no longer have libsystemd-journal (see https://bugzilla.redhat.com/show_bug.cgi?id=1350301)
+BuildRequires: pkgconfig(systemd)
+Requires: systemd-units
+%else
 BuildRequires: pkgconfig(systemd)
 Requires: systemd-units
 BuildRequires: pkgconfig(libsystemd-journal)
 %endif
+%endif
 %else
 Requires(post): chkconfig
 Requires(preun): chkconfig