Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update nginx image #3748

Merged
merged 2 commits into from
Feb 13, 2019
Merged

Update nginx image #3748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc17a6
Update nginx image
aledbf Feb 9, 2019
80d9024
Update e2e image
aledbf Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(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)
QEMUARCH=aarch64
Expand Down
2 changes: 1 addition & 1 deletion build/go-in-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1
fi

E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01092019-b433108ea
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02132019-7dc17a603

DOCKER_OPTS=${DOCKER_OPTS:-""}

Expand Down
8 changes: 4 additions & 4 deletions images/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.75
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.76

RUN clean-install \
g++ \
Expand All @@ -25,9 +25,9 @@ RUN clean-install \
python \
pkg-config

ENV GOLANG_VERSION 1.11.4
ENV GOLANG_VERSION 1.11.5
ENV GO_ARCH linux-amd64
ENV GOLANG_SHA fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b
ENV GOLANG_SHA ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25

RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \
Expand Down Expand Up @@ -62,5 +62,5 @@ RUN luarocks install luacheck \
RUN go get github.com/onsi/ginkgo/ginkgo \
&& go get golang.org/x/lint/golint

RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.12.4/bin/linux/amd64/kubectl \
RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
10 changes: 3 additions & 7 deletions internal/ingress/controller/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ limitations under the License.
package controller

import (
"k8s.io/apimachinery/pkg/util/intstr"
"os"
"os/exec"
"syscall"

"k8s.io/apimachinery/pkg/util/intstr"

"fmt"

"k8s.io/klog"
Expand Down Expand Up @@ -108,10 +109,5 @@ func nginxExecCommand(args ...string) *exec.Cmd {
}

func nginxTestCommand(cfg string) *exec.Cmd {
ngx := os.Getenv("NGINX_BINARY")
if ngx == "" {
ngx = defBinary
}

return exec.Command("authbind", "--deep", ngx, "-c", cfg, "-t")
return exec.Command(defBinary, "-c", cfg, "-t")
}
3 changes: 3 additions & 0 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ RUN bash -eu -c ' \
RUN setcap 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

talked in Slack: this is to fix #3732


# Create symlinks to redirect nginx logs to stdout and stderr docker log collector
# This only works if nginx is started with CMD or ENTRYPOINT
RUN ln -sf /dev/stdout /var/log/nginx/access.log
Expand Down