1. docker
  2. Commit c4f1cb779179b6145702174614706c462a5ceaae
Browse code

Add Fedora 25 RPMs

This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.

Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule

Once released, the image will be updated for
GA

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2016/11/10 02:16:13
Showing 3 changed files
contrib/builder/rpm/amd64/fedora-25/Dockerfile
History View file @ c4f1cb7
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,18 @@
0 
+#
1 
+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
2 
+#
3 
+
4 
+FROM andrewh5u/fedora-docker-base-25_beta:1.1
5 
+
6 
+RUN dnf install -y @development-tools fedora-packager
7 
+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
8 
+
9 
+ENV GO_VERSION 1.7.3
10 
+RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11 
+ENV PATH $PATH:/usr/local/go/bin
12 
+
13 
+ENV AUTO_GOPATH 1
14 
+
15 
+ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
16 
+ENV RUNC_BUILDTAGS seccomp selinux
17 
+
contrib/builder/rpm/amd64/generate.sh
History View file @ c4f1cb7
... ... 
@@ -22,6 +22,12 @@ for version in "${versions[@]}"; do
22 22 
 	suite="${version##*-}"
23 23 
 	from="${distro}:${suite}"
24 24 
 	installer=yum
25 
+
26 
+	# TODO remove when offical image is available
27 
+	if [[ "$from" == "fedora:25" ]]; then
28 
+		from="andrewh5u/fedora-docker-base-25_beta:1.1"
29 
+	fi
30 
+
25 31 
 	if [[ "$distro" == "fedora" ]]; then
26 32 
 		installer=dnf
27 33 
 	fi
hack/make/.build-rpm/docker-engine.spec
History View file @ c4f1cb7
... ... 
@@ -24,10 +24,16 @@ Packager: Docker <support@docker.com>
24 24 
 BuildRequires: systemd-rpm-macros
25 25 
 %{?systemd_requires}
26 26 
 %else
27 
+%if 0%{?fedora} >= 25
28 
+# Systemd 230 and up no longer have libsystemd-journal (see https://bugzilla.redhat.com/show_bug.cgi?id=1350301)
29 
+BuildRequires: pkgconfig(systemd)
30 
+Requires: systemd-units
31 
+%else
27 32 
 BuildRequires: pkgconfig(systemd)
28 33 
 Requires: systemd-units
29 34 
 BuildRequires: pkgconfig(libsystemd-journal)
30 35 
 %endif
36 
+%endif
31 37 
 %else
32 38 
 Requires(post): chkconfig
33 39 
 Requires(preun): chkconfig