From 0030df868a318bfbdeedfd2158370f79c9d2f93a Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Sun, 14 Jun 2015 20:51:11 +0200 Subject: [PATCH 1/4] Do not compress rootfs archive in mkimage.sh. * This wastes CPU time for compressing and decompressing. Signed-off-by: Robin Schneider --- contrib/mkimage.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/mkimage.sh b/contrib/mkimage.sh index cd2fa748d8..7ab956cdab 100755 --- a/contrib/mkimage.sh +++ b/contrib/mkimage.sh @@ -71,18 +71,18 @@ nameserver 8.8.8.8 nameserver 8.8.4.4 EOF -tarFile="$dir/rootfs.tar.xz" +tarFile="$dir/rootfs.tar" touch "$tarFile" ( set -x - tar --numeric-owner -caf "$tarFile" -C "$rootfsDir" --transform='s,^./,,' . + tar --numeric-owner -cf "$tarFile" -C "$rootfsDir" --transform='s,^./,,' . ) echo >&2 "+ cat > '$dir/Dockerfile'" cat > "$dir/Dockerfile" <<'EOF' FROM scratch -ADD rootfs.tar.xz / +ADD rootfs.tar / EOF # if our generated image has a decent shell, let's set a default command From 52e193bed723c61df73be6f02941d4501866f4a6 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Fri, 19 Jun 2015 23:46:54 +0200 Subject: [PATCH 2/4] 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 --- contrib/mkimage.sh | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/contrib/mkimage.sh b/contrib/mkimage.sh index 7ab956cdab..325ce1c3f9 100755 --- a/contrib/mkimage.sh +++ b/contrib/mkimage.sh @@ -4,7 +4,7 @@ set -e mkimg="$(basename "$0")" 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 " $mkimg -t someuser/ubuntu debootstrap --include=ubuntu-minimal --components=main,universe trusty" echo >&2 " $mkimg -t someuser/busybox busybox-static" @@ -16,16 +16,19 @@ usage() { 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" unset optTemp dir= tag= +compression="auto" while true; do case "$1" in -d|--dir) dir="$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 ;; --) shift ; break ;; esac @@ -35,6 +38,18 @@ script="$1" [ "$script" ] || usage shift +if [ "$compression" == "auto" ] || [ -z "$compression" ] +then + compression="xz" +fi + +if [ "$compression" == "none" ] +then + compression="" +else + compression=".${compression}" +fi + if [ ! -x "$scriptDir/$script" ]; then echo >&2 "error: $script does not exist or is not executable" echo >&2 " see $scriptDir for possible scripts" @@ -71,18 +86,18 @@ nameserver 8.8.8.8 nameserver 8.8.4.4 EOF -tarFile="$dir/rootfs.tar" +tarFile="$dir/rootfs.tar${compression}" touch "$tarFile" ( 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'" -cat > "$dir/Dockerfile" <<'EOF' +cat > "$dir/Dockerfile" < Date: Mon, 13 Jul 2015 22:55:14 +0200 Subject: [PATCH 3/4] Removed short parameters and use Bash features to make code shorter. Thanks to @tianon. Signed-off-by: Robin Schneider --- contrib/mkimage.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/contrib/mkimage.sh b/contrib/mkimage.sh index 325ce1c3f9..14fd0cd1bf 100755 --- a/contrib/mkimage.sh +++ b/contrib/mkimage.sh @@ -27,8 +27,8 @@ while true; do case "$1" in -d|--dir) dir="$2" ; shift 2 ;; -t|--tag) tag="$2" ; shift 2 ;; - -c|--compression) compression="$2" ; shift 2 ;; - -C|--no-compression) compression="none" ; shift 1 ;; + --compression) compression="$2" ; shift 2 ;; + --no-compression) compression="none" ; shift 1 ;; -h|--help) usage ;; --) shift ; break ;; esac @@ -38,17 +38,12 @@ script="$1" [ "$script" ] || usage shift -if [ "$compression" == "auto" ] || [ -z "$compression" ] +if [ "$compression" == 'auto' ] || [ -z "$compression" ] then - compression="xz" + compression='xz' fi -if [ "$compression" == "none" ] -then - compression="" -else - compression=".${compression}" -fi +[ "$compression" == 'none' ] && compression='' if [ ! -x "$scriptDir/$script" ]; then echo >&2 "error: $script does not exist or is not executable" @@ -86,7 +81,7 @@ nameserver 8.8.8.8 nameserver 8.8.4.4 EOF -tarFile="$dir/rootfs.tar${compression}" +tarFile="$dir/rootfs.tar${compression:+.$compression}" touch "$tarFile" ( @@ -97,7 +92,7 @@ touch "$tarFile" echo >&2 "+ cat > '$dir/Dockerfile'" cat > "$dir/Dockerfile" < Date: Thu, 16 Jul 2015 10:44:58 +0200 Subject: [PATCH 4/4] Updated usage information because of removed short parameters. Signed-off-by: Robin Schneider --- contrib/mkimage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mkimage.sh b/contrib/mkimage.sh index 14fd0cd1bf..3976d72d9f 100755 --- a/contrib/mkimage.sh +++ b/contrib/mkimage.sh @@ -4,7 +4,7 @@ set -e mkimg="$(basename "$0")" usage() { - echo >&2 "usage: $mkimg [-d dir] [-t tag] [-c compression] script [script-args]" + echo >&2 "usage: $mkimg [-d dir] [-t tag] [--compression algo| --no-compression] script [script-args]" 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/busybox busybox-static"