p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add containerd/runc exes to bundle dir after build

Browse Source 
Not sure if this is the right setup given the containerd change but I need
to have the built version of the nested exes (containerd, runc...) available
to me after the build is completed so I'm always testing using the latest
versions.  This PR will copy them into the same bundles dir so people can
them use them if they wish w/o having to build each separately.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1bf5eb20e53b7e242792fcbe399cb997b6a2ba4b
Component: engine
This commit is contained in:
Doug Davis
2016-03-19 09:39:55 -07:00
parent f70a4e02ca
commit 73e4af88e4
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/engine/hack/make/binary
View File

@ -62,3 +62,18 @@ echo "Created binary: $DEST/$BINARY_FULLNAME"
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
hash_files "$DEST/$BINARY_FULLNAME"
# Add nested executables to bundle dir so we have complete set of
# them available, but only if the native OS/ARCH is the same as the
# OS/ARCH of the build target
if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
echo "Copying nested executables into $DEST"
(set -x
if [ -x /usr/local/bin/runc ]; then
cp /usr/local/bin/runc $DEST/
cp /usr/local/bin/ctr $DEST/
cp /usr/local/bin/containerd $DEST/
cp /usr/local/bin/containerd-shim $DEST/
fi
)
fi

15
components/engine/hack/make/gccgo
View File

@ -27,3 +27,18 @@ echo "Created binary: $DEST/$BINARY_FULLNAME"
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
hash_files "$DEST/$BINARY_FULLNAME"
# Add nested executables to bundle dir so we have complete set of
# them available, but only if the native OS/ARCH is the same as the
# OS/ARCH of the build target
if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
echo "Copying nested executables into $DEST"
(set -x
if [ -x /usr/local/bin/runc ]; then
cp /usr/local/bin/runc $DEST/
cp /usr/local/bin/ctr $DEST/
cp /usr/local/bin/containerd $DEST/
cp /usr/local/bin/containerd-shim $DEST/
fi
)
fi