From 418eb3ce3d8bd954273be52b071c6a84f17bdd63 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 6 Jun 2017 14:27:41 -0700 Subject: [PATCH] Use internal systemd scripts for RPM packaging Signed-off-by: Eli Uriegas Upstream-commit: cbfe576e680b19c5f4c992e52bee59f2bc540026 Component: packaging --- components/packaging/rpm/Makefile | 3 ++- components/packaging/rpm/centos-7/docker-ce.spec | 3 +-- components/packaging/rpm/fedora-24/docker-ce.spec | 2 +- components/packaging/rpm/fedora-25/docker-ce.spec | 2 +- components/packaging/rpm/gen-rpm-ver | 7 ++++++- .../docker.service.rpm => rpm/systemd/docker.service} | 0 6 files changed, 11 insertions(+), 6 deletions(-) rename components/packaging/{systemd/docker.service.rpm => rpm/systemd/docker.service} (100%) diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 2f6b015a21..f2649500ba 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -11,7 +11,8 @@ RPMBUILD=docker run --privileged --rm \ -v $(CURDIR)/rpmbuild/BUILD:/root/rpmbuild/BUILD \ -v $(CURDIR)/rpmbuild/BUILDROOT:/root/rpmbuild/BUILDROOT \ -v $(CURDIR)/rpmbuild/RPMS:/root/rpmbuild/RPMS \ - -v $(CURDIR)/rpmbuild/SRPMS:/root/rpmbuild/SRPMS + -v $(CURDIR)/rpmbuild/SRPMS:/root/rpmbuild/SRPMS \ + -v $(CURDIR)/systemd:/systemd RPMBUILD_FLAGS=-ba\ --define '_gitcommit $(word 3,$(GEN_RPM_VER))' \ --define '_release $(word 2,$(GEN_RPM_VER))' \ diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 449eb67b82..8cc082efc1 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -96,7 +96,7 @@ install -p -m 644 engine/contrib/udev/80-docker.rules $RPM_BUILD_ROOT/%{_sysconf install -d $RPM_BUILD_ROOT/etc/sysconfig install -d $RPM_BUILD_ROOT/%{_initddir} install -d $RPM_BUILD_ROOT/%{_unitdir} -install -p -m 644 engine/contrib/init/systemd/docker.service.rpm $RPM_BUILD_ROOT/%{_unitdir}/docker.service +install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service # add bash, zsh, and fish completions install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions @@ -165,4 +165,3 @@ fi %changelog * Wed May 10 2017 17.06.0-dev -- Initial RPM release diff --git a/components/packaging/rpm/fedora-24/docker-ce.spec b/components/packaging/rpm/fedora-24/docker-ce.spec index d40fa67cb0..a0432f4857 100644 --- a/components/packaging/rpm/fedora-24/docker-ce.spec +++ b/components/packaging/rpm/fedora-24/docker-ce.spec @@ -96,7 +96,7 @@ install -p -m 644 engine/contrib/udev/80-docker.rules $RPM_BUILD_ROOT/%{_sysconf install -d $RPM_BUILD_ROOT/etc/sysconfig install -d $RPM_BUILD_ROOT/%{_initddir} install -d $RPM_BUILD_ROOT/%{_unitdir} -install -p -m 644 engine/contrib/init/systemd/docker.service.rpm $RPM_BUILD_ROOT/%{_unitdir}/docker.service +install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service # add bash, zsh, and fish completions install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions diff --git a/components/packaging/rpm/fedora-25/docker-ce.spec b/components/packaging/rpm/fedora-25/docker-ce.spec index c172718034..3efd3fcaac 100644 --- a/components/packaging/rpm/fedora-25/docker-ce.spec +++ b/components/packaging/rpm/fedora-25/docker-ce.spec @@ -95,7 +95,7 @@ install -p -m 644 engine/contrib/udev/80-docker.rules $RPM_BUILD_ROOT/%{_sysconf install -d $RPM_BUILD_ROOT/etc/sysconfig install -d $RPM_BUILD_ROOT/%{_initddir} install -d $RPM_BUILD_ROOT/%{_unitdir} -install -p -m 644 engine/contrib/init/systemd/docker.service.rpm $RPM_BUILD_ROOT/%{_unitdir}/docker.service +install -p -m 644 /systemd/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service # add bash, zsh, and fish completions install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions diff --git a/components/packaging/rpm/gen-rpm-ver b/components/packaging/rpm/gen-rpm-ver index 596e969d79..ef9ba7c708 100755 --- a/components/packaging/rpm/gen-rpm-ver +++ b/components/packaging/rpm/gen-rpm-ver @@ -5,6 +5,11 @@ VERSION=$2 [[ $# < 2 ]] && echo 'not enough args' && exit 1 +DATE_COMMAND="date" +if [[ $(uname) -eq "Darwin" ]]; then + DATE_COMMAND="docker run --rm alpine date" +fi + GIT_COMMAND="git -C $ENGINE_DIR" rpmName=docker-ce rpmVersion="$VERSION" @@ -32,7 +37,7 @@ fi # if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ]; then gitUnix="$($GIT_COMMAND log -1 --pretty='%at')" - gitDate="$(date --date "@$gitUnix" +'%Y%m%d.%H%M%S')" + gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')" gitCommit="$($GIT_COMMAND log -1 --pretty='%h')" gitVersion="${gitDate}.git${gitCommit}" # gitVersion is now something like '20150128.112847.17e840a' diff --git a/components/packaging/systemd/docker.service.rpm b/components/packaging/rpm/systemd/docker.service similarity index 100% rename from components/packaging/systemd/docker.service.rpm rename to components/packaging/rpm/systemd/docker.service