From 4249820c38a8162417b3ce31fc392a5ffbf33e6c Mon Sep 17 00:00:00 2001 From: Jason Schmidt Date: Tue, 31 Jan 2023 11:59:05 -0700 Subject: [PATCH 1/2] feat: add nginx 1.23.3 and 1.22.6 and bump OTEL to 1.8.1 tag --- nginx_build_versions.txt | 2 ++ nginx_source_checksums.txt | 3 +++ ngx_otel_module/Dockerfile.base.alpine | 2 +- ngx_otel_module/Dockerfile.base.debian | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nginx_build_versions.txt b/nginx_build_versions.txt index c656eb4..724fc5a 100644 --- a/nginx_build_versions.txt +++ b/nginx_build_versions.txt @@ -2,3 +2,5 @@ 1.20.1 1.21.6 1.23.0 +1.23.3 +1.22.1 \ No newline at end of file diff --git a/nginx_source_checksums.txt b/nginx_source_checksums.txt index 34844f9..1989b1e 100644 --- a/nginx_source_checksums.txt +++ b/nginx_source_checksums.txt @@ -5,3 +5,6 @@ d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe downloads/ngin b20f3bf533a518a6f0f3a7967dfeed872d268d31e4cc121a0001329602ddcfbb downloads/nginx-1.21.5.tar.gz 66dc7081488811e9f925719e34d1b4504c2801c81dee2920e5452a86b11405ae downloads/nginx-1.21.6.tar.gz 820acaa35b9272be9e9e72f6defa4a5f2921824709f8aa4772c78ab31ed94cd1 downloads/nginx-1.23.0.tar.gz +75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54 downloads/nginx-1.23.3.tar.gz +9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31 downloads/nginx-1.22.1.tar.gz + diff --git a/ngx_otel_module/Dockerfile.base.alpine b/ngx_otel_module/Dockerfile.base.alpine index c56fe77..56ed474 100644 --- a/ngx_otel_module/Dockerfile.base.alpine +++ b/ngx_otel_module/Dockerfile.base.alpine @@ -2,7 +2,7 @@ ARG ARCH=amd64 FROM $ARCH/alpine:3.14 ENV GRPC_VERSION_TAG=v1.36.4 -ENV OTEL_CPP_VERSION_TAG=v1.2.0 +ENV OTEL_CPP_VERSION_TAG=v1.8.1 RUN apk add git curl make build-base cmake patch linux-headers curl-dev zlib-dev pcre-dev diff --git a/ngx_otel_module/Dockerfile.base.debian b/ngx_otel_module/Dockerfile.base.debian index efb61c5..8de37fd 100644 --- a/ngx_otel_module/Dockerfile.base.debian +++ b/ngx_otel_module/Dockerfile.base.debian @@ -3,7 +3,7 @@ FROM $ARCH/debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive ENV GRPC_VERSION_TAG=v1.36.4 -ENV OTEL_CPP_VERSION_TAG=v1.2.0 +ENV OTEL_CPP_VERSION_TAG=v1.8.1 RUN set -eux; \ apt-get update -qqq; \ From c1d263e61d002a3745d557f5eb47f3898645bcd1 Mon Sep 17 00:00:00 2001 From: Jason Schmidt Date: Wed, 1 Feb 2023 12:44:57 -0700 Subject: [PATCH 2/2] fix: revert otel version for debugging --- ngx_otel_module/Dockerfile.base.alpine | 2 +- ngx_otel_module/Dockerfile.base.debian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ngx_otel_module/Dockerfile.base.alpine b/ngx_otel_module/Dockerfile.base.alpine index 56ed474..c56fe77 100644 --- a/ngx_otel_module/Dockerfile.base.alpine +++ b/ngx_otel_module/Dockerfile.base.alpine @@ -2,7 +2,7 @@ ARG ARCH=amd64 FROM $ARCH/alpine:3.14 ENV GRPC_VERSION_TAG=v1.36.4 -ENV OTEL_CPP_VERSION_TAG=v1.8.1 +ENV OTEL_CPP_VERSION_TAG=v1.2.0 RUN apk add git curl make build-base cmake patch linux-headers curl-dev zlib-dev pcre-dev diff --git a/ngx_otel_module/Dockerfile.base.debian b/ngx_otel_module/Dockerfile.base.debian index 8de37fd..efb61c5 100644 --- a/ngx_otel_module/Dockerfile.base.debian +++ b/ngx_otel_module/Dockerfile.base.debian @@ -3,7 +3,7 @@ FROM $ARCH/debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive ENV GRPC_VERSION_TAG=v1.36.4 -ENV OTEL_CPP_VERSION_TAG=v1.8.1 +ENV OTEL_CPP_VERSION_TAG=v1.2.0 RUN set -eux; \ apt-get update -qqq; \