Skip to content

Commit

Permalink
Bump nginx base images to version 1.25.5 and update docker to push im…
Browse files Browse the repository at this point in the history
…age only to github repo
  • Loading branch information
Dushyant Kumar committed Aug 26, 2024
1 parent be34c83 commit 51679bd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/update-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ jobs:
with:
context: git
images: |
opentracing/nginx-opentracing
ghcr.io/opentracing-contrib/nginx-opentracing
ghcr.io/OrionSopra/nginx-opentracing
flavor: |
latest=true
suffix=${{ matrix.os != 'debian' && '-' || '' }}${{ matrix.os != 'debian' && matrix.os || '' }},onlatest=true
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da


### Base build image for debian
FROM nginx:1.27.1 AS build-nginx-debian
FROM nginx:1.25.5 AS build-nginx-debian

RUN DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
&& echo "deb-src [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/debian/ ${DEBIAN_VERSION} nginx" >> /etc/apt/sources.list.d/nginx.list \
Expand All @@ -214,7 +214,7 @@ RUN DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-releas


### Base build image for alpine
FROM nginx:1.27.1-alpine AS build-nginx-alpine
FROM nginx:1.25.5-alpine AS build-nginx-alpine
RUN apk add --no-cache \
build-base \
pcre2-dev \
Expand All @@ -241,12 +241,12 @@ RUN curl -fsSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION


### Base image for alpine
FROM nginx:1.27.1-alpine AS nginx-alpine
FROM nginx:1.25.5-alpine AS nginx-alpine
RUN apk add --no-cache libstdc++


### Base image for debian
FROM nginx:1.27.1 AS nginx-debian
FROM nginx:1.25.5 AS nginx-debian


### Build final image
Expand Down

0 comments on commit 51679bd

Please sign in to comment.