Update nginx image

This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-09-25 18:35:01 -03:00
parent 471049bd5b
commit 3f29e436f3
4 changed files with 7 additions and 5 deletions

View file

@ -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.62
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.63
ifeq ($(ARCH),arm)
QEMUARCH=arm

View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1
fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09122018-167ed7f
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09252018-471049b
DOCKER_OPTS=${DOCKER_OPTS:-""}

View file

@ -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.61
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.63
RUN clean-install \
g++ \

View file

@ -20,8 +20,7 @@ WORKDIR /etc/nginx
RUN clean-install \
diffutils \
valgrind \
dumb-init
libcap2-bin
COPY . /
@ -43,6 +42,9 @@ RUN bash -eu -c ' \
&& chown www-data.www-data /etc/nginx/nginx.conf \
&& chown www-data.www-data /etc/nginx/opentracing.json
RUN setcap cap_net_bind_service=+ep /nginx-ingress-controller \
&& setcap -v cap_net_bind_service=+ep /nginx-ingress-controller
# 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