diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-02-22 02:44:52 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-02-22 02:44:52 +0000 |
| commit | c0cbc25366dd615433774f8d12ff28cce727fc95 (patch) | |
| tree | d4117f8040694b9a74196b94658bb82aaa66ea62 | |
| parent | 12d69b0da85becbd878d3cbaaf0e695105f5a202 (diff) | |
Fix to make install-docker more robust
Change-Id: I4365f5175be0ed240c68fa6ec4401d24c5f06893
Signed-off-by: Carsten Lund <lund@research.att.com>
| -rw-r--r-- | dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/install-docker.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/install-docker.sh b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/install-docker.sh index cc73a1e..541bda4 100644 --- a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/install-docker.sh +++ b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/install-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash cd $(dirname $(readlink -e $0)) export PATH=$PATH:$(pwd) @@ -21,16 +21,19 @@ apt-get update # # get certificates # -apt-get install -q -y apt-transport-https ca-certificates || - _fail "apt-transport-http ca-certificates installation failed" -_print "apt-transport-htps ca-certificates installed ..." - +apt-get install -q -y apt-transport-https ca-certificates curl software-properties-common || + _fail "apt-transport-http ca-certificates curl software-properties-common installation failed" +_print "apt-transport-htps ca-certificates curl software-properties-common installed ..." # makes the aufs storage driver available # -apt-get install -q -y linux-image-extra-${REL} linux-image-extra-virtual || - _fail "linux-image-extra-${REL} or linux-image-extra-virtual installation failed" -_print "linux-image-extra-virtual aufs storage driver installed ..." +apt-get install -q -y linux-image-extra-${REL} || + _fail "linux-image-extra-${REL} failed" +_print "linux-image-extra-${REL} installed ..." + +aptitude install -q -y linux-image-extra-virtual || + _fail "linux-image-extra-virtual installation failed" +_print "linux-image-extra-virtual installed ..." # # Add GPG key @@ -61,6 +64,8 @@ apt-get install -q -y apparmor || _fail "apparmor installation failed" _print "apparmor installed ..." +apt-get update + apt-get install -q -y docker-engine || _fail "docker-engine installation failed" _print "docker-engine installed ..." @@ -87,7 +92,6 @@ fi _print "Starting docker ..." service docker restart - # # END # |