Merge branch 'main' into add-msi-tests

open-telemetry · Dec 10, 2024 · 56d5433 · 56d5433
2 parents f0293b0 + e9680b2
commit 56d5433
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/distributions/otelcol-contrib/Dockerfile b/distributions/otelcol-contrib/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 as certs
+FROM alpine:3.21 as certs
 RUN apk --update add ca-certificates
 
 FROM scratch

diff --git a/distributions/otelcol-k8s/Dockerfile b/distributions/otelcol-k8s/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 as certs
+FROM alpine:3.21 as certs
 RUN apk --update add ca-certificates
 
 FROM scratch

diff --git a/distributions/otelcol-otlp/Dockerfile b/distributions/otelcol-otlp/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 as certs
+FROM alpine:3.21 as certs
 RUN apk --update add ca-certificates
 
 FROM scratch

diff --git a/distributions/otelcol/Dockerfile b/distributions/otelcol/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.20 as certs
+FROM alpine:3.21 as certs
 RUN apk --update add ca-certificates
 
 FROM scratch