From 40bb27ca1c133e8b5971780ab70f2f88613336d6 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Mon, 13 Aug 2018 18:30:00 -0700 Subject: [PATCH] Simplify script to install docker (#1925) Signed-off-by: Qi Luo --- build_debian.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build_debian.sh b/build_debian.sh index d531a72073..fc8a2cb59b 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -162,10 +162,10 @@ sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apparmor docker_deb_url=https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}.deb docker_deb_temp=`mktemp` trap_push "rm -f $docker_deb_temp" -wget $docker_deb_url -qO $docker_deb_temp && { \ - sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \ - sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f; \ -} +wget $docker_deb_url -qO $docker_deb_temp +sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \ + sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f + ## Add docker config drop-in to select aufs, otherwise it may select other storage driver sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/ ## Note: $_ means last argument of last command