commit 4f00b1156e835c7e0d8d1efeadbf483bdd3dee4e Author: Elan Ruusamäe <g...@pld-linux.org> Date: Sun Oct 29 15:50:04 2017 +0200
pass full commit hash to runc and containerd build docker-ce.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) --- diff --git a/docker-ce.spec b/docker-ce.spec index daf947b..e1746ef 100644 --- a/docker-ce.spec +++ b/docker-ce.spec @@ -170,13 +170,10 @@ ln -s ../../../.. components/cli/.gopath/src/github.com/docker/cli %patch0 -p1 -d components/engine %build -f=components/engine/hack/dockerfile/binaries-commits -v=$(awk -F= '/^RUNC_COMMIT/ {print $2}' $f) -echo "$v" | grep "^%{runc_commit}" -v=$(awk -F= '/^CONTAINERD_COMMIT/ {print $2}' $f) -echo "$v" | grep "^%{containerd_commit}" -v=$(awk -F= '/^LIBNETWORK_COMMIT/ {print $2}' $f) -echo "$v" | grep "^%{libnetwork_commit}" +. components/engine/hack/dockerfile/binaries-commits +echo "$RUNC_COMMIT" | grep "^%{runc_commit}" +echo "$CONTAINERD_COMMIT" | grep "^%{containerd_commit}" +echo "$LIBNETWORK_COMMIT" | grep "^%{libnetwork_commit}" export VERSION=%{version} export GITCOMMIT="pld/%{version}" # for cli @@ -186,12 +183,13 @@ export DOCKER_GITCOMMIT="pld/%{version}" # for engine sed -i -e 's,shell git,shell false,' runc/Makefile GOPATH=$(pwd)/runc \ %{__make} -C runc \ - COMMIT=%{runc_commit} + COMMIT=$RUNC_COMMIT ./runc/runc -v # build docker-containerd GOPATH=$(pwd)/containerd \ -%{__make} -C containerd +%{__make} -C containerd \ + GIT_COMMIT=$CONTAINERD_COMMIT # build docker-proxy cd libnetwork ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/docker-ce.git/commitdiff/b5a029723bf4621b6078594c9ffcd01a38cafe0e _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit