DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx image

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-02-09 18:53:31 -03:00
parent 5c4854b537
commit 7dc17a603d
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch # Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.75 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.76
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
QEMUARCH=aarch64 QEMUARCH=aarch64

10
internal/ingress/controller/util.go
View file

@ -17,11 +17,12 @@ limitations under the License.
package controller package controller
import ( import (
"k8s.io/apimachinery/pkg/util/intstr"
"os" "os"
"os/exec" "os/exec"
"syscall" "syscall"
"k8s.io/apimachinery/pkg/util/intstr"
"fmt" "fmt"
"k8s.io/klog" "k8s.io/klog"
@ -108,10 +109,5 @@ func nginxExecCommand(args ...string) *exec.Cmd {
} }
func nginxTestCommand(cfg string) *exec.Cmd { func nginxTestCommand(cfg string) *exec.Cmd {
ngx := os.Getenv("NGINX_BINARY") return exec.Command(defBinary, "-c", cfg, "-t")
if ngx == "" {
ngx = defBinary
}
return exec.Command("authbind", "--deep", ngx, "-c", cfg, "-t")
} }

3
rootfs/Dockerfile
View file

@ -42,6 +42,9 @@ RUN bash -eu -c ' \
RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \ RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \
&& setcap -v cap_net_bind_service=+ep /nginx-ingress-controller && setcap -v cap_net_bind_service=+ep /nginx-ingress-controller
RUN setcap cap_net_bind_service=+ep /usr/sbin/nginx \
&& setcap -v cap_net_bind_service=+ep /usr/sbin/nginx
# Create symlinks to redirect nginx logs to stdout and stderr docker log collector # Create symlinks to redirect nginx logs to stdout and stderr docker log collector
# This only works if nginx is started with CMD or ENTRYPOINT # This only works if nginx is started with CMD or ENTRYPOINT
RUN ln -sf /dev/stdout /var/log/nginx/access.log RUN ln -sf /dev/stdout /var/log/nginx/access.log