Skip to content

Commit 982b520

Browse files
lucacomelucacome
authored
Merge branch 'master' into renovate/debian-13.x
2 parents 067eeea + 32f0c94 commit 982b520

File tree

13 files changed

+49
-48
lines changed

13 files changed

+49
-48
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
runs-on: ubuntu-24.04
2121
steps:
2222
- name: Checkout Repository
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v6
2424

2525
- name: Create/Update Draft
26-
uses: lucacome/draft-release@v2.0.1
26+
uses: lucacome/draft-release@v2.0.2
2727
with:
2828
minor-label: "enhancement"
2929
major-label: "change"
@@ -46,19 +46,18 @@ jobs:
4646
1.24.0,
4747
1.25.5,
4848
1.26.3,
49-
1.27.0,
50-
1.27.1,
51-
1.27.2,
52-
1.27.3,
53-
1.27.4,
5449
1.27.5,
5550
1.28.0,
51+
1.28.1,
5652
1.29.0,
57-
1.29.1
53+
1.29.1,
54+
1.29.2,
55+
1.29.3,
56+
1.29.4
5857
]
5958
steps:
6059
- name: Checkout Repository
61-
uses: actions/checkout@v5
60+
uses: actions/checkout@v6
6261

6362
- name: Docker Buildx
6463
uses: docker/setup-buildx-action@v3
@@ -86,7 +85,7 @@ jobs:
8685
cp out/sbom.spdx.json linux-amd64-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.sbom.spdx.json
8786
8887
- name: Upload artifact
89-
uses: actions/upload-artifact@v5
88+
uses: actions/upload-artifact@v6
9089
with:
9190
name: nginx-opentracing-modules-${{ matrix.nginx_version }}
9291
path: linux-*-nginx-${{ matrix.nginx_version }}-ngx_http_module.so.*

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL

‎.github/workflows/docker-openresty.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- 5000:5000
2626
steps:
2727
- name: Checkout Repository
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Docker Buildx
3131
uses: docker/setup-buildx-action@v3
@@ -99,7 +99,7 @@ jobs:
9999
if: always()
100100

101101
- name: Upload Scan Results
102-
uses: actions/upload-artifact@v5
102+
uses: actions/upload-artifact@v6
103103
continue-on-error: true
104104
with:
105105
name: scan-results-openresty

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
os: [debian, alpine]
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3333

3434
- name: Output Variables
3535
id: var
@@ -120,7 +120,7 @@ jobs:
120120
if: always()
121121

122122
- name: Upload Scan Results
123-
uses: actions/upload-artifact@v5
123+
uses: actions/upload-artifact@v6
124124
continue-on-error: true
125125
with:
126126
name: scan-results-${{ matrix.os }}

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-24.04
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
sparse-checkout: |
1818
labeler.yml

‎.github/workflows/system-testing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-24.04
2525
steps:
2626
- name: Checkout Repository
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: Get vars
3030
id: vars
@@ -87,7 +87,7 @@ jobs:
8787
working-directory: test
8888

8989
- name: Upload artifact
90-
uses: actions/upload-artifact@v5
90+
uses: actions/upload-artifact@v6
9191
if: always()
9292
with:
9393
name: test-log

‎.github/workflows/update-docker-images.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
docker_platforms: ${{ steps.vars.outputs.docker_platforms }}
2020
steps:
2121
- name: Checkout Repository
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525
- name: Get latest tag
@@ -28,7 +28,7 @@ jobs:
2828
tag=$(git tag --sort=-version:refname | head -n1)
2929
echo "git_tag=${tag//v}" >> $GITHUB_OUTPUT
3030
- name: Checkout Repository at ${{ steps.tag.outputs.git_tag }}
31-
uses: actions/checkout@v5
31+
uses: actions/checkout@v6
3232
with:
3333
ref: refs/tags/v${{ steps.tag.outputs.git_tag }}
3434
- name: Set Base image version
@@ -82,7 +82,7 @@ jobs:
8282
needs-updating: ${{ needs.check.outputs.needs-updating-alpine }}
8383
steps:
8484
- name: Checkout Repository at ${{ needs.variables.outputs.git_tag }}
85-
uses: actions/checkout@v5
85+
uses: actions/checkout@v6
8686
with:
8787
ref: refs/tags/v${{ needs.variables.outputs.git_tag }}
8888
if: ${{ matrix.needs-updating == 'true' }}

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repos:
3030
- id: detect-private-key
3131

3232
- repo: https://github.com/asottile/pyupgrade
33-
rev: v3.21.0
33+
rev: v3.21.2
3434
hooks:
3535
- id: pyupgrade
3636

@@ -40,21 +40,21 @@ repos:
4040
- id: isort
4141

4242
- repo: https://github.com/psf/black-pre-commit-mirror
43-
rev: 25.9.0
43+
rev: 25.12.0
4444
hooks:
4545
- id: black
4646

4747
- repo: https://github.com/gitleaks/gitleaks
48-
rev: v8.28.0
48+
rev: v8.30.0
4949
hooks:
5050
- id: gitleaks
5151

5252
- repo: https://github.com/DavidAnson/markdownlint-cli2
53-
rev: v0.18.1
53+
rev: v0.20.0
5454
hooks:
5555
- id: markdownlint-cli2
5656

5757
- repo: https://github.com/adrienverge/yamllint.git
58-
rev: v1.37.1
58+
rev: v1.38.0
5959
hooks:
6060
- id: yamllint

‎Dockerfile‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# syntax=docker/dockerfile:1.19
1+
# syntax=docker/dockerfile:1.20
22
ARG BUILD_OS=debian
3-
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.8.0 AS xx
3+
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.9.0 AS xx
44

55
### Build base image for debian
66
FROM --platform=$BUILDPLATFORM debian:13 AS build-base-debian
@@ -139,12 +139,14 @@ RUN [ "$(xx-info vendor)" = "alpine" ] && export QEMU_LD_PREFIX=/$(xx-info); \
139139
### Build Jaeger cpp-client
140140
FROM opentracing-cpp AS jaeger-cpp-client
141141
ARG JAEGER_CPP_VERSION=v0.9.0
142-
ARG YAML_CPP_VERSION=0.8.0
142+
ARG YAML_CPP_VERSION=89ff142b991af432b5d7a7cee55282f082a7e629
143143
ARG TARGETPLATFORM
144144

145145
# Building yaml-cpp manually because of a bug in jaeger-client-cpp that won't install it
146-
RUN xx-info env && git clone --depth 1 -b $YAML_CPP_VERSION https://github.com/jbeder/yaml-cpp/ && \
147-
cd yaml-cpp && mkdir .build && cd .build && \
146+
RUN xx-info env && git init yaml-cpp && cd yaml-cpp && \
147+
git fetch --depth 1 https://github.com/jbeder/yaml-cpp.git $YAML_CPP_VERSION && \
148+
git checkout FETCH_HEAD && \
149+
mkdir .build && cd .build && \
148150
cmake $(xx-clang --print-cmake-defines) \
149151
-DBUILD_SHARED_LIBS=ON \
150152
-DCMAKE_BUILD_TYPE=Release \
@@ -205,7 +207,7 @@ RUN xx-info env && git clone --depth 1 -b $DATADOG_VERSION https://github.com/Da
205207

206208

207209
### Base build image for debian
208-
FROM nginx:1.29.3 AS build-nginx-debian
210+
FROM nginx:1.29.4 AS build-nginx-debian
209211

210212
RUN DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release) \
211213
&& 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 +216,7 @@ RUN DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-releas
214216

215217

216218
### Base build image for alpine
217-
FROM nginx:1.29.3-alpine AS build-nginx-alpine
219+
FROM nginx:1.29.4-alpine AS build-nginx-alpine
218220
RUN apk add --no-cache \
219221
build-base \
220222
pcre2-dev \
@@ -241,12 +243,12 @@ RUN curl -fsSL -O https://github.com/nginx/nginx/archive/release-${NGINX_VERSION
241243

242244

243245
### Base image for alpine
244-
FROM nginx:1.29.3-alpine AS nginx-alpine
246+
FROM nginx:1.29.4-alpine AS nginx-alpine
245247
RUN apk add --no-cache libstdc++
246248

247249

248250
### Base image for debian
249-
FROM nginx:1.29.3 AS nginx-debian
251+
FROM nginx:1.29.4 AS nginx-debian
250252

251253

252254
### Build final image

‎example/go/otel/docker-compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
otel:
3-
image: otel/opentelemetry-collector-contrib:0.138.0
3+
image: otel/opentelemetry-collector-contrib:0.143.1
44
volumes:
55
- ./otel.yml:/etc/otelcol/config.yaml
66

@@ -22,7 +22,7 @@ services:
2222
- "8082:8082"
2323

2424
jaeger:
25-
image: jaegertracing/all-in-one:1.74.0
25+
image: jaegertracing/all-in-one:1.76.0
2626
environment:
2727
- LOG_LEVEL=debug
2828
- COLLECTOR_ZIPKIN_HOST_PORT=:9411

0 commit comments

Comments
 (0)