From 51679bd28a35305397e81a66cb1c608eada8bbae Mon Sep 17 00:00:00 2001 From: Dushyant Kumar Date: Mon, 26 Aug 2024 12:29:15 +0000 Subject: [PATCH] Bump nginx base images to version 1.25.5 and update docker to push image only to github repo --- .github/workflows/update-docker-images.yml | 3 +-- Dockerfile | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update-docker-images.yml b/.github/workflows/update-docker-images.yml index 23496054..03059baa 100644 --- a/.github/workflows/update-docker-images.yml +++ b/.github/workflows/update-docker-images.yml @@ -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 diff --git a/Dockerfile b/Dockerfile index fc96c719..69d3e20f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ @@ -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 \ @@ -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