diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57c31b43..02ab5cf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,6 +55,7 @@ jobs: 1.25.3, 1.25.4, 1.25.5, + 1.26.0 ] steps: - name: Checkout Repository diff --git a/Dockerfile b/Dockerfile index 1b9be954..f2199eb5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 ARG BUILD_OS=debian -ARG BUILD_NGINX_VERSION=1.25.5 +ARG BUILD_NGINX_VERSION=1.26.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 63d472e5..308e2d09 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.25.3 +ARG NGINX_VERSION=1.26.0 RUN set -x \ && apt-get update \ diff --git a/Makefile b/Makefile index eca27f2d..de55aa13 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.25.4 --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.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: