From 943ca557fdfc88288f72149df4857e8b2f159e9f Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Thu, 7 Sep 2017 13:48:36 -0300 Subject: [PATCH] Fix eol in nginx template --- controllers/nginx/rootfs/ingress-controller/clean-nginx-conf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/nginx/rootfs/ingress-controller/clean-nginx-conf.sh b/controllers/nginx/rootfs/ingress-controller/clean-nginx-conf.sh index 53662152f..0e109b7df 100755 --- a/controllers/nginx/rootfs/ingress-controller/clean-nginx-conf.sh +++ b/controllers/nginx/rootfs/ingress-controller/clean-nginx-conf.sh @@ -5,4 +5,4 @@ # first sed removes empty lines # second sed command replaces the empty lines -sed -e 's/^ *$/\'$'\n/g' | sed -e '/^$/{N;/^\n$/d;}' +sed -e 's/\r//g' | sed -e 's/^ *$/\'$'\n/g' | sed -e '/^$/{N;/^\n$/d;}'