kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Add Fedora 25 RPMs

Browse source 
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>
This commit is contained in:
Sebastiaan van Stijn 2016-11-09 18:16:13 +01:00
parent 4705728b41
commit c4f1cb7791
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
contrib/builder/rpm/amd64/fedora-25/Dockerfile Normal file
View file

@ -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

6
contrib/builder/rpm/amd64/generate.sh
View file

@ -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

6
hack/make/.build-rpm/docker-engine.spec
View file

@ -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