From b4afcff073a887e36a7e9d9d4dcf27d4c6a33e38 Mon Sep 17 00:00:00 2001 From: Eoin O'Shaughnessy Date: Thu, 30 May 2024 11:54:35 +0100 Subject: [PATCH 1/4] Bump NGINX to 1.26.1 --- .github/workflows/ci.yml | 2 +- Dockerfile | 2 +- Dockerfile-test | 2 +- Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02ab5cf1..d5967087 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: 1.25.3, 1.25.4, 1.25.5, - 1.26.0 + 1.26.1 ] steps: - name: Checkout Repository diff --git a/Dockerfile b/Dockerfile index b77eb643..8f67d06d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 ARG BUILD_OS=debian -ARG BUILD_NGINX_VERSION=1.26.0 +ARG BUILD_NGINX_VERSION=1.26.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx ### Build base image for debian diff --git a/Dockerfile-test b/Dockerfile-test index 308e2d09..279f0323 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,7 +1,7 @@ FROM ubuntu:24.04 ARG OPENTRACING_CPP_VERSION=v1.6.0 -ARG NGINX_VERSION=1.26.0 +ARG NGINX_VERSION=1.26.1 RUN set -x \ && apt-get update \ diff --git a/Makefile b/Makefile index de55aa13..2b419a3b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ docker-image-alpine: DOCKER_BUILDKIT=1 docker build -f Dockerfile -t opentracing-contrib/nginx-opentracing --target final --build-arg BUILD_OS=alpine . docker-build-binaries: - DOCKER_BUILDKIT=1 docker buildx build --build-arg NGINX_VERSION=1.26.0 --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull . + DOCKER_BUILDKIT=1 docker buildx build --build-arg NGINX_VERSION=1.26.1 --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull . .PHONY: test test: From 2be7e899272859fd0bc10d76c207fd73ff76d1a5 Mon Sep 17 00:00:00 2001 From: Eoin O'Shaughnessy Date: Fri, 31 May 2024 09:42:27 +0100 Subject: [PATCH 2/4] bump NGINX 1.27.0 --- .github/workflows/ci.yml | 4 +++- Dockerfile | 2 +- Dockerfile-test | 2 +- Makefile | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5967087..9b736a12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,9 @@ jobs: 1.25.3, 1.25.4, 1.25.5, - 1.26.1 + 1.26.0, + 1.26.1, + 1.27.0, ] steps: - name: Checkout Repository diff --git a/Dockerfile b/Dockerfile index 8f67d06d..ca383cb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 ARG BUILD_OS=debian -ARG BUILD_NGINX_VERSION=1.26.1 +ARG BUILD_NGINX_VERSION=1.27.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx ### Build base image for debian diff --git a/Dockerfile-test b/Dockerfile-test index 279f0323..971e18d8 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -1,7 +1,7 @@ FROM ubuntu:24.04 ARG OPENTRACING_CPP_VERSION=v1.6.0 -ARG NGINX_VERSION=1.26.1 +ARG NGINX_VERSION=1.27.0 RUN set -x \ && apt-get update \ diff --git a/Makefile b/Makefile index 2b419a3b..534d485c 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ docker-image-alpine: DOCKER_BUILDKIT=1 docker build -f Dockerfile -t opentracing-contrib/nginx-opentracing --target final --build-arg BUILD_OS=alpine . docker-build-binaries: - DOCKER_BUILDKIT=1 docker buildx build --build-arg NGINX_VERSION=1.26.1 --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull . + DOCKER_BUILDKIT=1 docker buildx build --build-arg NGINX_VERSION=1.27.0 --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull . .PHONY: test test: From 2fb8504fcd0096c5472fc67d00df4467393e839e Mon Sep 17 00:00:00 2001 From: oseoin Date: Sat, 1 Jun 2024 13:16:05 +0100 Subject: [PATCH 3/4] Remove extra NGINX versions Remove earlier versions of 1.25 and 1.26 --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b736a12..05352149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,13 +49,7 @@ jobs: 1.22.1, 1.23.4, 1.24.0, - 1.25.0, - 1.25.1, - 1.25.2, - 1.25.3, - 1.25.4, 1.25.5, - 1.26.0, 1.26.1, 1.27.0, ] From 33ec959cc8bba937d18a39ac5daca219a07c9de3 Mon Sep 17 00:00:00 2001 From: oseoin Date: Sat, 1 Jun 2024 21:37:18 +0100 Subject: [PATCH 4/4] Re-add 1.26.0 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05352149..0351ad41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,7 @@ jobs: 1.23.4, 1.24.0, 1.25.5, + 1.26.0, 1.26.1, 1.27.0, ]