mirror of https://github.com/docker/docs.git
Merge pull request #21402 from crosbymichael/tar-binaries
Add containerd and runc binaries to tgz output
This commit is contained in:
commit
d02d48b4b1
24
hack/make.sh
24
hack/make.sh
|
@ -289,6 +289,30 @@ bundle() {
|
||||||
source "$SCRIPTDIR/make/$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() {
|
main() {
|
||||||
# We want this to fail if the bundles already exist and cannot be removed.
|
# 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.
|
# This is to avoid mixing bundles from different versions of the code.
|
||||||
|
|
|
@ -61,19 +61,5 @@ go build \
|
||||||
echo "Created binary: $DEST/$BINARY_FULLNAME"
|
echo "Created binary: $DEST/$BINARY_FULLNAME"
|
||||||
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
|
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
|
||||||
|
|
||||||
|
copy_containerd "$DEST" "hash"
|
||||||
hash_files "$DEST/$BINARY_FULLNAME"
|
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
|
|
||||||
|
|
|
@ -26,19 +26,5 @@ go build -compiler=gccgo \
|
||||||
echo "Created binary: $DEST/$BINARY_FULLNAME"
|
echo "Created binary: $DEST/$BINARY_FULLNAME"
|
||||||
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
|
ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
|
||||||
|
|
||||||
|
copy_containerd "$DEST" "hash"
|
||||||
hash_files "$DEST/$BINARY_FULLNAME"
|
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
|
|
||||||
|
|
|
@ -9,9 +9,10 @@ if [ ! -d "$CROSS/linux/amd64" ]; then
|
||||||
false
|
false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
(
|
||||||
for d in "$CROSS/"*/*; do
|
for d in "$CROSS/"*/*; do
|
||||||
GOARCH="$(basename "$d")"
|
export GOARCH="$(basename "$d")"
|
||||||
GOOS="$(basename "$(dirname "$d")")"
|
export GOOS="$(basename "$(dirname "$d")")"
|
||||||
BINARY_NAME="docker-$VERSION"
|
BINARY_NAME="docker-$VERSION"
|
||||||
BINARY_EXTENSION="$(export GOOS && binary_extension)"
|
BINARY_EXTENSION="$(export GOOS && binary_extension)"
|
||||||
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
|
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
|
||||||
|
@ -22,6 +23,7 @@ for d in "$CROSS/"*/*; do
|
||||||
|
|
||||||
mkdir -p "$DEST/build/usr/local/bin"
|
mkdir -p "$DEST/build/usr/local/bin"
|
||||||
cp -L "$d/$BINARY_FULLNAME" "$DEST/build/usr/local/bin/docker$BINARY_EXTENSION"
|
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
|
tar --numeric-owner --owner 0 -C "$DEST/build" -czf "$TGZ" usr
|
||||||
|
|
||||||
|
@ -31,3 +33,4 @@ for d in "$CROSS/"*/*; do
|
||||||
|
|
||||||
echo "Created tgz: $TGZ"
|
echo "Created tgz: $TGZ"
|
||||||
done
|
done
|
||||||
|
)
|
||||||
|
|
Loading…
Reference in New Issue