Skip to content

Commit

Permalink
Update debian base to buster for Plus images
Browse files Browse the repository at this point in the history
  • Loading branch information
Dean-Coakley authored Feb 24, 2020
1 parent 24dc092 commit 5f13609
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build/DockerfileForPlus
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)
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion build/DockerfileWithOpentracing
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN set -x \
&& cp objs/ngx_http_opentracing_module.so /ngx_http_opentracing_module.so


FROM debian:stretch-slim AS tracer-downloader
FROM debian:buster-slim AS tracer-downloader
ARG JAEGER_VERSION=v0.4.2
RUN set -x \
&& apt-get update \
Expand Down
10 changes: 5 additions & 5 deletions build/DockerfileWithOpentracingForPlus
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 \
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5f13609

Please sign in to comment.