From b1c14cb5ee07a20cb8e1f35ca26f3400e4349a38 Mon Sep 17 00:00:00 2001 From: kasper3 <33230602+kasper3@users.noreply.github.com> Date: Tue, 2 Jan 2018 23:04:56 +0200 Subject: [PATCH 1/2] Check if tput command exists before using it Fix #8311 @eerhardt --- scripts/obtain/dotnet-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index b65fcddec..412f299c0 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -22,7 +22,7 @@ exec 3>&1 # Setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. # See if stdout is a terminal -if [ -t 1 ]; then +if [ -t 1 ] && command -v tput > /dev/null; then # see if it supports colors ncolors=$(tput colors) if [ -n "$ncolors" ] && [ $ncolors -ge 8 ]; then From a30c6a45fb3f75573e49a78dc52ceddc9626b8bf Mon Sep 17 00:00:00 2001 From: kasper3 <33230602+kasper3@users.noreply.github.com> Date: Tue, 2 Jan 2018 23:13:54 +0200 Subject: [PATCH 2/2] Remove ncurses dependency --- scripts/docker/alpine.3.6/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile index 826a5f4ba..746f1bd4b 100644 --- a/scripts/docker/alpine.3.6/Dockerfile +++ b/scripts/docker/alpine.3.6/Dockerfile @@ -6,8 +6,6 @@ # Dockerfile that creates a container suitable to build dotnet-cli FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 -RUN apk add --no-cache sudo ncurses - # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker # from issuing a warning ARG USER_ID=0