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

Add function for copy containerd

Browse Source 
This adds a function for copying containerd and other binaries as well
as adding a hash for those files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 78568f2eb54a6455dad566923f3c6f03ac300405
Component: engine
This commit is contained in:
Michael Crosby
2016-03-22 11:49:01 -07:00
parent 85da9b3aae
commit dbc8de7ddc
3 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/engine/hack/make.sh
View File

@ -289,6 +289,28 @@ bundle() {
source "$SCRIPTDIR/make/$bundle" "$@"
}
copy_containerd() {
dir="$1"
# 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
(set -x
if [ -x /usr/local/bin/runc ]; then
echo "Copying nested executables into $dir"
cp /usr/local/bin/runc "$dir/"
cp /usr/local/bin/ctr "$dir/"
cp /usr/local/bin/containerd "$dir/"
cp /usr/local/bin/containerd-shim "$dir/"
hash_files "$dir/runc"
hash_files "$dir/ctr"
hash_files "$dir/containerd"
hash_files "$dir/containerd-shim"
fi
)
fi
}
main() {
# We want this to fail if the bundles already exist and cannot be removed.
# This is to avoid mixing bundles from different versions of the code.

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

@ -61,19 +61,5 @@ go build \
echo "Created binary: $DEST/$BINARY_FULLNAME"
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
copy_containerd "$DEST"
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

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

@ -26,19 +26,5 @@ go build -compiler=gccgo \
echo "Created binary: $DEST/$BINARY_FULLNAME"
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
copy_containerd "$DEST"
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