beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #21402 from crosbymichael/tar-binaries

Browse source 
Add containerd and runc binaries to tgz output
This commit is contained in:
David Calavera 2016-03-22 17:11:34 -07:00
commit d02d48b4b1
4 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hack/make.sh
View file

@ -289,6 +289,30 @@ 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/"
if [ "$2" == "hash" ]; then
hash_files "$dir/runc"
hash_files "$dir/ctr"
hash_files "$dir/containerd"
hash_files "$dir/containerd-shim"
fi
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
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"
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
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"
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

7
hack/make/tgz
View file

@ -9,9 +9,10 @@ if [ ! -d "$CROSS/linux/amd64" ]; then
false
fi
(
for d in "$CROSS/"*/*; do
GOARCH="$(basename "$d")"
GOOS="$(basename "$(dirname "$d")")"
export GOARCH="$(basename "$d")"
export GOOS="$(basename "$(dirname "$d")")"
BINARY_NAME="docker-$VERSION"
BINARY_EXTENSION="$(export GOOS && binary_extension)"
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
@ -22,6 +23,7 @@ for d in "$CROSS/"*/*; do
mkdir -p "$DEST/build/usr/local/bin"
cp -L "$d/$BINARY_FULLNAME" "$DEST/build/usr/local/bin/docker$BINARY_EXTENSION"
copy_containerd "$DEST/build/usr/local/bin/"
tar --numeric-owner --owner 0 -C "$DEST/build" -czf "$TGZ" usr
@ -31,3 +33,4 @@ for d in "$CROSS/"*/*; do
echo "Created tgz: $TGZ"
done
)