docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented as proposed by @tianon and @ypid. Restores the default behavior (using xz compression). 

* `--compression=none` and `--no-compression` to disable compression.
* `--compression=auto` to use the default compression (enabled by default).
* `--compression=xz` to use xz compression (default compression).
* `--compression=gz` to use gzip compression.

Signed-off-by: Robin Schneider <ypid@riseup.net>
This commit is contained in:
Robin Schneider 2015-06-19 23:46:54 +02:00
parent 0030df868a
commit 52e193bed7
No known key found for this signature in database
GPG Key ID: 489A4D5EC353C98A
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/mkimage.sh
View File

@ -4,7 +4,7 @@ set -e
mkimg="$(basename "$0")" mkimg="$(basename "$0")"
usage() { usage() {
echo >&2 "usage: $mkimg [-d dir] [-t tag] script [script-args]" echo >&2 "usage: $mkimg [-d dir] [-t tag] [-c compression] script [script-args]"
echo >&2 " ie: $mkimg -t someuser/debian debootstrap --variant=minbase jessie" echo >&2 " ie: $mkimg -t someuser/debian debootstrap --variant=minbase jessie"
echo >&2 " $mkimg -t someuser/ubuntu debootstrap --include=ubuntu-minimal --components=main,universe trusty" echo >&2 " $mkimg -t someuser/ubuntu debootstrap --include=ubuntu-minimal --components=main,universe trusty"
echo >&2 " $mkimg -t someuser/busybox busybox-static" echo >&2 " $mkimg -t someuser/busybox busybox-static"
@ -16,16 +16,19 @@ usage() {
scriptDir="$(dirname "$(readlink -f "$BASH_SOURCE")")/mkimage" scriptDir="$(dirname "$(readlink -f "$BASH_SOURCE")")/mkimage"
optTemp=$(getopt --options '+d:t:h' --longoptions 'dir:,tag:,help' --name "$mkimg" -- "$@") optTemp=$(getopt --options '+d:t:c:hC' --longoptions 'dir:,tag:,compression:,no-compression,help' --name "$mkimg" -- "$@")
eval set -- "$optTemp" eval set -- "$optTemp"
unset optTemp unset optTemp
dir= dir=
tag= tag=
compression="auto"
while true; do while true; do
case "$1" in case "$1" in
-d|--dir) dir="$2" ; shift 2 ;; -d|--dir) dir="$2" ; shift 2 ;;
-t|--tag) tag="$2" ; shift 2 ;; -t|--tag) tag="$2" ; shift 2 ;;
-c|--compression) compression="$2" ; shift 2 ;;
-C|--no-compression) compression="none" ; shift 1 ;;
-h|--help) usage ;; -h|--help) usage ;;
--) shift ; break ;; --) shift ; break ;;
esac esac
@ -35,6 +38,18 @@ script="$1"
[ "$script" ] || usage [ "$script" ] || usage
shift shift
if [ "$compression" == "auto" ] || [ -z "$compression" ]
then
compression="xz"
fi
if [ "$compression" == "none" ]
then
compression=""
else
compression=".${compression}"
fi
if [ ! -x "$scriptDir/$script" ]; then if [ ! -x "$scriptDir/$script" ]; then
echo >&2 "error: $script does not exist or is not executable" echo >&2 "error: $script does not exist or is not executable"
echo >&2 " see $scriptDir for possible scripts" echo >&2 " see $scriptDir for possible scripts"
@ -71,18 +86,18 @@ nameserver 8.8.8.8
nameserver 8.8.4.4 nameserver 8.8.4.4
EOF EOF
tarFile="$dir/rootfs.tar" tarFile="$dir/rootfs.tar${compression}"
touch "$tarFile" touch "$tarFile"
( (
set -x set -x
tar --numeric-owner -cf "$tarFile" -C "$rootfsDir" --transform='s,^./,,' . tar --numeric-owner --create --auto-compress --file "$tarFile" --directory "$rootfsDir" --transform='s,^./,,' .
) )
echo >&2 "+ cat > '$dir/Dockerfile'" echo >&2 "+ cat > '$dir/Dockerfile'"
cat > "$dir/Dockerfile" <<'EOF' cat > "$dir/Dockerfile" <<EOF
FROM scratch FROM scratch
ADD rootfs.tar / ADD $tarFile /
EOF EOF
# if our generated image has a decent shell, let's set a default command # if our generated image has a decent shell, let's set a default command