From c4f1cb779179b6145702174614706c462a5ceaae Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 9 Nov 2016 18:16:13 +0100 Subject: [PATCH] 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 --- contrib/builder/rpm/amd64/fedora-25/Dockerfile | 18 ++++++++++++++++++ contrib/builder/rpm/amd64/generate.sh | 6 ++++++ hack/make/.build-rpm/docker-engine.spec | 6 ++++++ 3 files changed, 30 insertions(+) create mode 100644 contrib/builder/rpm/amd64/fedora-25/Dockerfile diff --git a/contrib/builder/rpm/amd64/fedora-25/Dockerfile b/contrib/builder/rpm/amd64/fedora-25/Dockerfile new file mode 100644 index 0000000000..2b03b555bc --- /dev/null +++ b/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 + diff --git a/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh index 3b32b868d6..e1f05fa424 100755 --- a/contrib/builder/rpm/amd64/generate.sh +++ b/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 diff --git a/hack/make/.build-rpm/docker-engine.spec b/hack/make/.build-rpm/docker-engine.spec index 19f405c2c1..d53e55b6c9 100644 --- a/hack/make/.build-rpm/docker-engine.spec +++ b/hack/make/.build-rpm/docker-engine.spec @@ -24,10 +24,16 @@ Packager: Docker 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