From 77295c31b80630f87553c967bc8299eb088ff97e Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 22 Jan 2019 14:06:22 +0100 Subject: [PATCH 1/4] first fix for docker --- bootstrap-root.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bootstrap-root.sh b/bootstrap-root.sh index 822f0ed..18b6ce1 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -1,11 +1,9 @@ #! /bin/bash -# fail immediately on error -set -e CURLOPT=${CURLOPT:-"--location --remote-time --show-error --silent --fail --tlsv1.2"} -apt update \ - && apt dist-upgrade \ - && apt install -y \ +apt-get update \ + && apt-get dist-upgrade \ + && apt-get install -y \ apt-file \ apt-transport-https \ bash-completion \ From 1cde012776b9bf7993750e44fa2c208902d25880 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 22 Jan 2019 14:11:40 +0100 Subject: [PATCH 2/4] Update bootstrap-root.sh --- bootstrap-root.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap-root.sh b/bootstrap-root.sh index 18b6ce1..39b4043 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -31,6 +31,7 @@ apt-get update \ tig \ zsh \ && apt-file update +echo "Status: $?" # node related curl $CURLOPT https://deb.nodesource.com/setup_10.x | bash - From 6af34457776302bfb933989fdd66d8e3dc238892 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 22 Jan 2019 14:14:25 +0100 Subject: [PATCH 3/4] Update bootstrap-root.sh --- bootstrap-root.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-root.sh b/bootstrap-root.sh index 39b4043..f5efd71 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -1,8 +1,9 @@ #! /bin/bash +set -e CURLOPT=${CURLOPT:-"--location --remote-time --show-error --silent --fail --tlsv1.2"} apt-get update \ - && apt-get dist-upgrade \ + && apt-get dist-upgrade -y \ && apt-get install -y \ apt-file \ apt-transport-https \ From 3fd75f2f44f465ff14ed253f1a0ece125e763b84 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Tue, 22 Jan 2019 14:23:16 +0100 Subject: [PATCH 4/4] finalized --- bootstrap-root.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-root.sh b/bootstrap-root.sh index f5efd71..408f2aa 100755 --- a/bootstrap-root.sh +++ b/bootstrap-root.sh @@ -1,4 +1,5 @@ #! /bin/bash +# fail immediately on error set -e CURLOPT=${CURLOPT:-"--location --remote-time --show-error --silent --fail --tlsv1.2"} @@ -32,7 +33,6 @@ apt-get update \ tig \ zsh \ && apt-file update -echo "Status: $?" # node related curl $CURLOPT https://deb.nodesource.com/setup_10.x | bash -