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

Bump nginx from 1.21.3 to 1.21.4 #227

Merged
merged 2 commits into from
Nov 10, 2021
Merged

Bump nginx from 1.21.3 to 1.21.4 #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c1eff4
Bump nginx from 1.21.3 to 1.21.4
dependabot[bot] Nov 10, 2021
326ebb2
Update to Debian Bullseye
lucacome Nov 10, 2021
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
11 changes: 6 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG BUILD_OS=debian
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.0.0 AS xx

### Build base image for debian
FROM --platform=$BUILDPLATFORM debian:buster as build-base-debian
FROM --platform=$BUILDPLATFORM debian:bullseye as build-base-debian

RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \
Expand Down Expand Up @@ -201,9 +201,9 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da


### Base build image for debian
FROM nginx:1.21.3 as build-nginx-debian
FROM nginx:1.21.4 as build-nginx-debian

RUN echo "deb-src http://nginx.org/packages/mainline/debian/ stretch nginx" >> /etc/apt/sources.list \
RUN echo "deb-src http://nginx.org/packages/mainline/debian/ bullseye nginx" >> /etc/apt/sources.list \
&& apt-get update \
&& apt-get build-dep -y nginx

Expand Down Expand Up @@ -237,12 +237,13 @@ RUN curl -sSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION}


### Base image for alpine
FROM nginx:1.21.3-alpine as nginx-alpine
# docker.io/library/nginx is a temporary workaround for Dependabot to see this as different from the one used in Debian
FROM docker.io/library/nginx:1.21.3-alpine as nginx-alpine
RUN apk add --no-cache libstdc++


### Base image for debian
FROM nginx:1.21.3 as nginx-debian
FROM nginx:1.21.4 as nginx-debian


### Build final image
Expand Down