From 26f2b1330ff83d2a057b1f395b9699df973352da Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 5 Mar 2019 10:08:34 -0300
Subject: [PATCH] Remove authbind

---
 images/nginx/rootfs/Dockerfile      |  2 --
 images/nginx/rootfs/build.sh        |  7 -------
 images/nginx/rootfs/entrypoint.sh   | 19 -------------------
 internal/ingress/controller/util.go | 16 ++++++----------
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100755 images/nginx/rootfs/entrypoint.sh

diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile
index 8d1fd7862..6faaa7357 100644
--- a/images/nginx/rootfs/Dockerfile
+++ b/images/nginx/rootfs/Dockerfile
@@ -30,6 +30,4 @@ RUN ln -sf /dev/stderr /var/log/nginx/error.log
 
 EXPOSE 80 443
 
-ENTRYPOINT [ "/entrypoint.sh" ]
-
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
index 143946127..e8bbc2fb7 100755
--- a/images/nginx/rootfs/build.sh
+++ b/images/nginx/rootfs/build.sh
@@ -92,7 +92,6 @@ clean-install \
   python \
   luarocks \
   libmaxminddb-dev \
-  authbind \
   dumb-init \
   gdb \
   valgrind \
@@ -630,9 +629,3 @@ for dir in "${writeDirs[@]}"; do
   mkdir -p ${dir};
   chown -R www-data.www-data ${dir};
 done
-
-for value in {1..1023};do
-  touch /etc/authbind/byport/$value
-  chown www-data /etc/authbind/byport/$value
-  chmod 755 /etc/authbind/byport/$value
-done
diff --git a/images/nginx/rootfs/entrypoint.sh b/images/nginx/rootfs/entrypoint.sh
deleted file mode 100755
index 46bb5e076..000000000
--- a/images/nginx/rootfs/entrypoint.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/dumb-init /bin/bash
-
-# Copyright 2018 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-authbind --deep $@
diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go
index de9405cb4..13a39e146 100644
--- a/internal/ingress/controller/util.go
+++ b/internal/ingress/controller/util.go
@@ -83,7 +83,6 @@ const (
 )
 
 var valgrind = []string{
-	"valgrind",
 	"--tool=memcheck",
 	"--leak-check=full",
 	"--show-leak-kinds=all",
@@ -91,21 +90,18 @@ var valgrind = []string{
 }
 
 func nginxExecCommand(args ...string) *exec.Cmd {
-	ngx := os.Getenv("NGINX_BINARY")
-	if ngx == "" {
-		ngx = defBinary
-	}
-
-	cmdArgs := []string{"--deep"}
+	cmdArgs := []string{}
 
 	if os.Getenv("RUN_WITH_VALGRIND") == "true" {
 		cmdArgs = append(cmdArgs, valgrind...)
+		cmdArgs = append(cmdArgs, defBinary, "-c", cfgPath)
+		cmdArgs = append(cmdArgs, args...)
+		return exec.Command("valgrind", cmdArgs...)
 	}
 
-	cmdArgs = append(cmdArgs, ngx, "-c", cfgPath)
+	cmdArgs = append(cmdArgs, "-c", cfgPath)
 	cmdArgs = append(cmdArgs, args...)
-
-	return exec.Command("authbind", cmdArgs...)
+	return exec.Command(defBinary, cmdArgs...)
 }
 
 func nginxTestCommand(cfg string) *exec.Cmd {