-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update debian base to buster for Plus images
- Loading branch information
1 parent
24dc092
commit 5f13609
Showing
3 changed files
with
9 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
ARG GOLANG_CONTAINER=golang:latest | ||
|
||
FROM debian:stretch-slim AS base | ||
FROM debian:buster-slim AS base | ||
|
||
LABEL maintainer="NGINX Docker Maintainers <[email protected]>" | ||
|
||
ENV NGINX_PLUS_VERSION 20-1~stretch | ||
ENV NGINX_PLUS_VERSION 20-1~buster | ||
ARG IC_VERSION | ||
|
||
# Download certificate and key from the customer portal (https://cs.nginx.com) | ||
|
@@ -36,7 +36,7 @@ RUN set -x \ | |
&& echo "Acquire::https::plus-pkgs.nginx.com::SslCert \"/etc/ssl/nginx/nginx-repo.crt\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& echo "Acquire::https::plus-pkgs.nginx.com::SslKey \"/etc/ssl/nginx/nginx-repo.key\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& echo "Acquire::https::plus-pkgs.nginx.com::User-Agent \"k8s-ic-$IC_VERSION-apt\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& printf "deb https://plus-pkgs.nginx.com/debian stretch nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ | ||
&& printf "deb https://plus-pkgs.nginx.com/debian buster nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ | ||
&& apt-get update && apt-get install -y nginx-plus=${NGINX_PLUS_VERSION} \ | ||
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ | ||
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
ARG GOLANG_CONTAINER=golang:latest | ||
|
||
FROM debian:stretch-slim AS tracer-downloader | ||
FROM debian:buster-slim AS tracer-downloader | ||
ARG JAEGER_VERSION=v0.4.2 | ||
|
||
RUN set -x \ | ||
|
@@ -9,11 +9,11 @@ RUN set -x \ | |
&& wget https://github.com/jaegertracing/jaeger-client-cpp/releases/download/${JAEGER_VERSION}/libjaegertracing_plugin.linux_amd64.so -O /usr/local/lib/libjaegertracing_plugin.so | ||
|
||
# Final Image | ||
FROM debian:stretch-slim AS base | ||
FROM debian:buster-slim AS base | ||
LABEL maintainer="NGINX Docker Maintainers <[email protected]>" | ||
|
||
ENV NGINX_PLUS_VERSION 20-1~stretch | ||
ENV NGINX_OPENTRACING_MODULE_VERSION 20+0.9.0-1~stretch | ||
ENV NGINX_PLUS_VERSION 20-1~buster | ||
ENV NGINX_OPENTRACING_MODULE_VERSION 20+0.9.0-1~buster | ||
|
||
ARG IC_VERSION | ||
|
||
|
@@ -46,7 +46,7 @@ RUN set -x \ | |
&& echo "Acquire::https::plus-pkgs.nginx.com::SslCert \"/etc/ssl/nginx/nginx-repo.crt\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& echo "Acquire::https::plus-pkgs.nginx.com::SslKey \"/etc/ssl/nginx/nginx-repo.key\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& echo "Acquire::https::plus-pkgs.nginx.com::User-Agent \"k8s-ic-$IC_VERSION-apt\";" >> /etc/apt/apt.conf.d/90nginx \ | ||
&& printf "deb https://plus-pkgs.nginx.com/debian stretch nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ | ||
&& printf "deb https://plus-pkgs.nginx.com/debian buster nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \ | ||
&& apt-get update && apt-get install -y \ | ||
nginx-plus=${NGINX_PLUS_VERSION} \ | ||
# Install OpenTracing module | ||
|