From 41c2b0d500b834b23804c6e0a0a4bf5705f0343a Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 3 Mar 2026 14:11:44 -0800 Subject: [PATCH 1/3] Revert "chore(deps): update docker.io/bitnamilegacy/kafka docker tag to v4 (#1410)" This reverts commit 0ff4c99ae23c7863663e65f0ab5082e1304e4244. --- internal/test/integration/components/kafka/docker-compose.yml | 2 +- internal/test/integration/docker-compose-java-kafka.yml | 2 +- internal/test/integration/docker-compose-python-kafka.yml | 2 +- internal/test/oats/kafka/docker-compose-obi-go-kafka-go.yml | 2 +- internal/test/oats/kafka/docker-compose-obi-go-kafka-sarama.yml | 2 +- internal/test/oats/kafka/docker-compose-obi-python-kafka.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/test/integration/components/kafka/docker-compose.yml b/internal/test/integration/components/kafka/docker-compose.yml index 2f129aae31..fa9abf8102 100644 --- a/internal/test/integration/components/kafka/docker-compose.yml +++ b/internal/test/integration/components/kafka/docker-compose.yml @@ -14,7 +14,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" volumes: diff --git a/internal/test/integration/docker-compose-java-kafka.yml b/internal/test/integration/docker-compose-java-kafka.yml index 4445bd90be..442f186ef7 100644 --- a/internal/test/integration/docker-compose-java-kafka.yml +++ b/internal/test/integration/docker-compose-java-kafka.yml @@ -15,7 +15,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" volumes: diff --git a/internal/test/integration/docker-compose-python-kafka.yml b/internal/test/integration/docker-compose-python-kafka.yml index af689f1b0c..824c64fef0 100644 --- a/internal/test/integration/docker-compose-python-kafka.yml +++ b/internal/test/integration/docker-compose-python-kafka.yml @@ -15,7 +15,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" volumes: diff --git a/internal/test/oats/kafka/docker-compose-obi-go-kafka-go.yml b/internal/test/oats/kafka/docker-compose-obi-go-kafka-go.yml index f5f6a83622..69b7be8fbf 100644 --- a/internal/test/oats/kafka/docker-compose-obi-go-kafka-go.yml +++ b/internal/test/oats/kafka/docker-compose-obi-go-kafka-go.yml @@ -12,7 +12,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" - "9092:9092" diff --git a/internal/test/oats/kafka/docker-compose-obi-go-kafka-sarama.yml b/internal/test/oats/kafka/docker-compose-obi-go-kafka-sarama.yml index 5dd907a8b8..12a02123c9 100644 --- a/internal/test/oats/kafka/docker-compose-obi-go-kafka-sarama.yml +++ b/internal/test/oats/kafka/docker-compose-obi-go-kafka-sarama.yml @@ -12,7 +12,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" - "9092:9092" diff --git a/internal/test/oats/kafka/docker-compose-obi-python-kafka.yml b/internal/test/oats/kafka/docker-compose-obi-python-kafka.yml index 8512b4dd10..072ea4d39f 100644 --- a/internal/test/oats/kafka/docker-compose-obi-python-kafka.yml +++ b/internal/test/oats/kafka/docker-compose-obi-python-kafka.yml @@ -12,7 +12,7 @@ services: kafka: restart: always container_name: kafka-like - image: docker.io/bitnamilegacy/kafka:4.0@sha256:f45d5b813412e1ef7ce67b467309a84e4c6dc03d7626a0b6da867db9b69bd107 + image: docker.io/bitnamilegacy/kafka:3.9@sha256:55df55bfc7ed5980447387620afa3498eab3985a4d8c731013d82b3fa8b43bff ports: - "9093:9093" - "9092:9092" From a9de5013e73d0a03e3f37736690d590ea0dae619 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 3 Mar 2026 14:11:49 -0800 Subject: [PATCH 2/3] Revert "chore(deps): update docker (#1413)" This reverts commit 72e7f10378f4758ee7800cfcdff7930a4c360f2b. --- debug.Dockerfile | 2 +- examples/otel-collector/Dockerfile | 4 ++-- generator.Dockerfile | 2 +- .../integration/components/ai/openai/mock-server/Dockerfile | 2 +- .../components/ebpf-instrument-k8s-cache/Dockerfile | 2 +- .../test/integration/components/go_grpc_server_mux/Dockerfile | 2 +- .../integration/components/go_grpc_server_mux/Dockerfile_tls | 2 +- internal/test/integration/components/go_otel/Dockerfile | 2 +- internal/test/integration/components/go_otel_grpc/Dockerfile | 2 +- .../test/integration/components/go_simple_grpc/Dockerfile | 2 +- .../test/integration/components/gohttp2/client/Dockerfile | 2 +- .../test/integration/components/gohttp2/server/Dockerfile | 2 +- internal/test/integration/components/gokafka-seg/Dockerfile | 2 +- internal/test/integration/components/gokafka/Dockerfile | 2 +- internal/test/integration/components/gomongo/Dockerfile | 2 +- internal/test/integration/components/gomongov2/Dockerfile | 2 +- internal/test/integration/components/gomqtt/Dockerfile | 2 +- .../test/integration/components/gomysql-otelsql/Dockerfile | 2 +- internal/test/integration/components/gomysql-tls/Dockerfile | 2 +- internal/test/integration/components/gomysql/Dockerfile | 2 +- internal/test/integration/components/gopgx-pool/Dockerfile | 2 +- internal/test/integration/components/gopgx-stdlib/Dockerfile | 2 +- internal/test/integration/components/gopgx/Dockerfile | 2 +- internal/test/integration/components/goredis/Dockerfile | 2 +- internal/test/integration/components/gosql/Dockerfile | 2 +- internal/test/integration/components/grpcpinger/Dockerfile | 2 +- internal/test/integration/components/httppinger/Dockerfile | 2 +- .../test/integration/components/java_tls/wrapper/Dockerfile | 2 +- .../test/integration/components/keepaliveclient/Dockerfile | 2 +- internal/test/integration/components/obi/Dockerfile | 2 +- .../test/integration/components/obi/Dockerfile-with-javaagent | 2 +- internal/test/integration/components/obi/Dockerfile_dbg | 2 +- internal/test/integration/components/pingclient/Dockerfile | 2 +- internal/test/integration/components/sqlclient/Dockerfile | 2 +- internal/test/integration/components/testserver/Dockerfile | 2 +- .../integration/components/testserver/Dockerfile_duplicate | 2 +- .../test/integration/components/testserver/Dockerfile_nodebug | 2 +- .../test/integration/components/testserver/Dockerfile_rename1 | 2 +- .../test/integration/components/testserver/Dockerfile_static | 2 +- .../test/integration/components/tpinjector-server/Dockerfile | 2 +- internal/test/vm/Dockerfile | 2 +- k8scache.Dockerfile | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-) diff --git a/debug.Dockerfile b/debug.Dockerfile index 0d41a6eb3c..1838e0e40f 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0-alpine@sha256:d4c4845f5d60c6a974c6000ce58ae079328d03ab7f721a0734277e69905473e5 AS builder +FROM golang:1.25.7-alpine@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4ced AS builder ARG TARGETARCH diff --git a/examples/otel-collector/Dockerfile b/examples/otel-collector/Dockerfile index d6013d5403..29630f4608 100644 --- a/examples/otel-collector/Dockerfile +++ b/examples/otel-collector/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0-alpine@sha256:d4c4845f5d60c6a974c6000ce58ae079328d03ab7f721a0734277e69905473e5 AS builder +FROM golang:1.25.7-alpine@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4ced AS builder # Install build dependencies RUN apk add --no-cache git gcc musl-dev linux-headers @@ -13,7 +13,7 @@ WORKDIR /app/examples/otel-collector/otelcol-dev RUN go build -o otelcol-dev . # Final stage -FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 +FROM alpine:3.19@sha256:6baf43584bcb78f2e5847d1de515f23499913ac9f12bdf834811a3145eb11ca1 RUN apk add --no-cache ca-certificates # Note: libc6-compat is not needed since the binary is statically linked diff --git a/generator.Dockerfile b/generator.Dockerfile index 004422db45..476d1b1314 100644 --- a/generator.Dockerfile +++ b/generator.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0-alpine@sha256:d4c4845f5d60c6a974c6000ce58ae079328d03ab7f721a0734277e69905473e5 AS base +FROM golang:1.25.7-alpine@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4ced AS base FROM base AS dist WORKDIR /src diff --git a/internal/test/integration/components/ai/openai/mock-server/Dockerfile b/internal/test/integration/components/ai/openai/mock-server/Dockerfile index 89dbd398fd..3ba4ff138b 100644 --- a/internal/test/integration/components/ai/openai/mock-server/Dockerfile +++ b/internal/test/integration/components/ai/openai/mock-server/Dockerfile @@ -1,6 +1,6 @@ # Build the mock OpenAI server binary # Docker command must be invoked from the project root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/ebpf-instrument-k8s-cache/Dockerfile b/internal/test/integration/components/ebpf-instrument-k8s-cache/Dockerfile index e811fd8c6e..7a803fceda 100644 --- a/internal/test/integration/components/ebpf-instrument-k8s-cache/Dockerfile +++ b/internal/test/integration/components/ebpf-instrument-k8s-cache/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile b/internal/test/integration/components/go_grpc_server_mux/Dockerfile index 382adc0260..c78ddb864f 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls index 1db40c2473..565723edef 100644 --- a/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls +++ b/internal/test/integration/components/go_grpc_server_mux/Dockerfile_tls @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_otel/Dockerfile b/internal/test/integration/components/go_otel/Dockerfile index ffff369ce2..6e3d9ee099 100644 --- a/internal/test/integration/components/go_otel/Dockerfile +++ b/internal/test/integration/components/go_otel/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_otel_grpc/Dockerfile b/internal/test/integration/components/go_otel_grpc/Dockerfile index 06f5d55bf7..ec4012a1b8 100644 --- a/internal/test/integration/components/go_otel_grpc/Dockerfile +++ b/internal/test/integration/components/go_otel_grpc/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/go_simple_grpc/Dockerfile b/internal/test/integration/components/go_simple_grpc/Dockerfile index 16ae8b965c..43606df481 100644 --- a/internal/test/integration/components/go_simple_grpc/Dockerfile +++ b/internal/test/integration/components/go_simple_grpc/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gohttp2/client/Dockerfile b/internal/test/integration/components/gohttp2/client/Dockerfile index 12dd46a734..56c245d426 100644 --- a/internal/test/integration/components/gohttp2/client/Dockerfile +++ b/internal/test/integration/components/gohttp2/client/Dockerfile @@ -1,6 +1,6 @@ # Build the testclient binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gohttp2/server/Dockerfile b/internal/test/integration/components/gohttp2/server/Dockerfile index 310f8e49af..cd2062f263 100644 --- a/internal/test/integration/components/gohttp2/server/Dockerfile +++ b/internal/test/integration/components/gohttp2/server/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gokafka-seg/Dockerfile b/internal/test/integration/components/gokafka-seg/Dockerfile index 9daf279b7d..834b2cfa8f 100644 --- a/internal/test/integration/components/gokafka-seg/Dockerfile +++ b/internal/test/integration/components/gokafka-seg/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gokafka/Dockerfile b/internal/test/integration/components/gokafka/Dockerfile index e120f7f17f..dd46e90b4b 100644 --- a/internal/test/integration/components/gokafka/Dockerfile +++ b/internal/test/integration/components/gokafka/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomongo/Dockerfile b/internal/test/integration/components/gomongo/Dockerfile index 8a5bc2b062..e374f23606 100644 --- a/internal/test/integration/components/gomongo/Dockerfile +++ b/internal/test/integration/components/gomongo/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomongov2/Dockerfile b/internal/test/integration/components/gomongov2/Dockerfile index 8a5bc2b062..e374f23606 100644 --- a/internal/test/integration/components/gomongov2/Dockerfile +++ b/internal/test/integration/components/gomongov2/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomqtt/Dockerfile b/internal/test/integration/components/gomqtt/Dockerfile index 5b42c9edc3..7566430145 100644 --- a/internal/test/integration/components/gomqtt/Dockerfile +++ b/internal/test/integration/components/gomqtt/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomysql-otelsql/Dockerfile b/internal/test/integration/components/gomysql-otelsql/Dockerfile index e80c7174c6..cbcc170375 100644 --- a/internal/test/integration/components/gomysql-otelsql/Dockerfile +++ b/internal/test/integration/components/gomysql-otelsql/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomysql-tls/Dockerfile b/internal/test/integration/components/gomysql-tls/Dockerfile index 47af54cb36..2205ca8074 100644 --- a/internal/test/integration/components/gomysql-tls/Dockerfile +++ b/internal/test/integration/components/gomysql-tls/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gomysql/Dockerfile b/internal/test/integration/components/gomysql/Dockerfile index 47af54cb36..2205ca8074 100644 --- a/internal/test/integration/components/gomysql/Dockerfile +++ b/internal/test/integration/components/gomysql/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gopgx-pool/Dockerfile b/internal/test/integration/components/gopgx-pool/Dockerfile index 7f7411531f..7458df7586 100644 --- a/internal/test/integration/components/gopgx-pool/Dockerfile +++ b/internal/test/integration/components/gopgx-pool/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gopgx-stdlib/Dockerfile b/internal/test/integration/components/gopgx-stdlib/Dockerfile index fb552aec43..73eb9cd133 100644 --- a/internal/test/integration/components/gopgx-stdlib/Dockerfile +++ b/internal/test/integration/components/gopgx-stdlib/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the project root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gopgx/Dockerfile b/internal/test/integration/components/gopgx/Dockerfile index 819344da15..0fa5298cc3 100644 --- a/internal/test/integration/components/gopgx/Dockerfile +++ b/internal/test/integration/components/gopgx/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/goredis/Dockerfile b/internal/test/integration/components/goredis/Dockerfile index 419a5c29b9..cba5f7f638 100644 --- a/internal/test/integration/components/goredis/Dockerfile +++ b/internal/test/integration/components/goredis/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/gosql/Dockerfile b/internal/test/integration/components/gosql/Dockerfile index e26da4a0c9..314bfebab9 100644 --- a/internal/test/integration/components/gosql/Dockerfile +++ b/internal/test/integration/components/gosql/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/grpcpinger/Dockerfile b/internal/test/integration/components/grpcpinger/Dockerfile index 8231c03e71..f3cb6a9b2c 100644 --- a/internal/test/integration/components/grpcpinger/Dockerfile +++ b/internal/test/integration/components/grpcpinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/httppinger/Dockerfile b/internal/test/integration/components/httppinger/Dockerfile index 638c82a7d6..95cde35ae4 100644 --- a/internal/test/integration/components/httppinger/Dockerfile +++ b/internal/test/integration/components/httppinger/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/java_tls/wrapper/Dockerfile b/internal/test/integration/components/java_tls/wrapper/Dockerfile index f5a9db16fa..329f3ef757 100644 --- a/internal/test/integration/components/java_tls/wrapper/Dockerfile +++ b/internal/test/integration/components/java_tls/wrapper/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/keepaliveclient/Dockerfile b/internal/test/integration/components/keepaliveclient/Dockerfile index 444a6fdd3b..76c45141d8 100644 --- a/internal/test/integration/components/keepaliveclient/Dockerfile +++ b/internal/test/integration/components/keepaliveclient/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/obi/Dockerfile b/internal/test/integration/components/obi/Dockerfile index a6f7cc4a7f..5a1b3adf4f 100644 --- a/internal/test/integration/components/obi/Dockerfile +++ b/internal/test/integration/components/obi/Dockerfile @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/obi/Dockerfile-with-javaagent b/internal/test/integration/components/obi/Dockerfile-with-javaagent index 23ba058798..2cab083f51 100644 --- a/internal/test/integration/components/obi/Dockerfile-with-javaagent +++ b/internal/test/integration/components/obi/Dockerfile-with-javaagent @@ -15,7 +15,7 @@ RUN ./gradlew build --no-daemon # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/obi/Dockerfile_dbg b/internal/test/integration/components/obi/Dockerfile_dbg index 4195550b63..86fd88a2f0 100644 --- a/internal/test/integration/components/obi/Dockerfile_dbg +++ b/internal/test/integration/components/obi/Dockerfile_dbg @@ -1,7 +1,7 @@ # Development version of the beyla Dockerfile that compiles for coverage # and allows retrieving coverage files. # The production-ready minimal image is in the project root's dockerfile. -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/pingclient/Dockerfile b/internal/test/integration/components/pingclient/Dockerfile index cd3a46b22b..e20470dec1 100644 --- a/internal/test/integration/components/pingclient/Dockerfile +++ b/internal/test/integration/components/pingclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/sqlclient/Dockerfile b/internal/test/integration/components/sqlclient/Dockerfile index 19edc2fddc..35c7a59c72 100644 --- a/internal/test/integration/components/sqlclient/Dockerfile +++ b/internal/test/integration/components/sqlclient/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/testserver/Dockerfile b/internal/test/integration/components/testserver/Dockerfile index 8d0a940fb2..19ac59b78e 100644 --- a/internal/test/integration/components/testserver/Dockerfile +++ b/internal/test/integration/components/testserver/Dockerfile @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/testserver/Dockerfile_duplicate b/internal/test/integration/components/testserver/Dockerfile_duplicate index ee56050aed..1ddedc64db 100644 --- a/internal/test/integration/components/testserver/Dockerfile_duplicate +++ b/internal/test/integration/components/testserver/Dockerfile_duplicate @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/testserver/Dockerfile_nodebug b/internal/test/integration/components/testserver/Dockerfile_nodebug index 9e22961917..cc38c0ecff 100644 --- a/internal/test/integration/components/testserver/Dockerfile_nodebug +++ b/internal/test/integration/components/testserver/Dockerfile_nodebug @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/testserver/Dockerfile_rename1 b/internal/test/integration/components/testserver/Dockerfile_rename1 index 23615868a0..2b8a324726 100644 --- a/internal/test/integration/components/testserver/Dockerfile_rename1 +++ b/internal/test/integration/components/testserver/Dockerfile_rename1 @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/testserver/Dockerfile_static b/internal/test/integration/components/testserver/Dockerfile_static index be9bc7165c..8a67668d5a 100644 --- a/internal/test/integration/components/testserver/Dockerfile_static +++ b/internal/test/integration/components/testserver/Dockerfile_static @@ -1,6 +1,6 @@ # Build the testserver binary # Docker command must be invoked from the projec root directory -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/integration/components/tpinjector-server/Dockerfile b/internal/test/integration/components/tpinjector-server/Dockerfile index 277f3f53fb..30a4f24f8a 100644 --- a/internal/test/integration/components/tpinjector-server/Dockerfile +++ b/internal/test/integration/components/tpinjector-server/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH diff --git a/internal/test/vm/Dockerfile b/internal/test/vm/Dockerfile index 55dd4b1461..c621498b21 100644 --- a/internal/test/vm/Dockerfile +++ b/internal/test/vm/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 +FROM alpine:3.20@sha256:a4f4213abb84c497377b8544c81b3564f313746700372ec4fe84653e4fb03805 # this is the toplevel Makefile target to be invoked # see the contents of 'startup.sh' at the end of this file diff --git a/k8scache.Dockerfile b/k8scache.Dockerfile index 39bd5e31b8..d1b24bc5f3 100644 --- a/k8scache.Dockerfile +++ b/k8scache.Dockerfile @@ -1,5 +1,5 @@ # Build the binary for the k8s-cache service -FROM golang:1.26.0@sha256:fb612b7831d53a89cbc0aaa7855b69ad7b0caf603715860cf538df854d047b84 AS builder +FROM golang:1.25.7@sha256:931c889bca758a82fcbfcb1b6ed6ca1de30783e9e52e6093ad50060735cb99be AS builder ARG TARGETARCH ENV GOARCH=$TARGETARCH From cdd6bdcdeb3bf9f0d03adccd762533dc8534c49b Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Tue, 3 Mar 2026 14:11:51 -0800 Subject: [PATCH 3/3] Revert "chore(deps): update docker (#1414)" This reverts commit fa476e551a3d5e77dcff3050be4e21da73e119d8. --- internal/test/integration/components/dotnetserver/Dockerfile | 4 ++-- .../test/integration/components/java_tls/netty_tls/Dockerfile | 2 +- .../integration/components/java_tls/sync_async_tls/Dockerfile | 2 +- internal/test/integration/components/javakafka-tls/Dockerfile | 2 +- .../test/integration/components/javatestserver/Dockerfile_jar | 4 ++-- internal/test/integration/components/mysqldb/Dockerfile | 4 ++-- .../integration/components/nginx-rails-sql/testapi/Dockerfile | 4 ++-- internal/test/integration/components/nodeclient/Dockerfile | 2 +- internal/test/integration/components/nodejsdist/Dockerfile_b | 2 +- internal/test/integration/components/nodejsdist/Dockerfile_r | 2 +- internal/test/integration/components/nodejsserver/Dockerfile | 2 +- internal/test/integration/components/nodemultiproc/Dockerfile | 2 +- internal/test/integration/components/redis/Dockerfile | 2 +- .../integration/components/rubytestserver/testapi/Dockerfile | 4 ++-- .../components/rubytestserver/testapi/Dockerfile_tls | 4 ++-- .../test/integration/components/rustssltestserver/Dockerfile | 2 +- .../test/integration/components/testserver/Dockerfile_static | 2 +- internal/test/integration/components/tpclient/Dockerfile | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/test/integration/components/dotnetserver/Dockerfile b/internal/test/integration/components/dotnetserver/Dockerfile index fed90e73c6..381fcffb62 100644 --- a/internal/test/integration/components/dotnetserver/Dockerfile +++ b/internal/test/integration/components/dotnetserver/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:10.0@sha256:e362a8dbcd691522456da26a5198b8f3ca1d7641c95624fadc5e3e82678bd08a AS builder +FROM mcr.microsoft.com/dotnet/sdk:7.0@sha256:d32bd65cf5843f413e81f5d917057c82da99737cb1637e905a1a4bc2e7ec6c8d AS builder # Set the working directory to /build WORKDIR /build @@ -11,7 +11,7 @@ RUN dotnet build # Create final image from minimal + built binary -FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:aec87aa74ddf129da573fa69f42f229a23c953a1c6fdecedea1aa6b1fe147d76 +FROM mcr.microsoft.com/dotnet/aspnet:7.0@sha256:c7d9ee6cd01afe9aa80642e577c7cec9f5d87f88e5d70bd36fd61072079bc55b WORKDIR / COPY --from=builder /build/bin/Debug/net7.0/* . diff --git a/internal/test/integration/components/java_tls/netty_tls/Dockerfile b/internal/test/integration/components/java_tls/netty_tls/Dockerfile index 27033437ba..e3bfdac631 100644 --- a/internal/test/integration/components/java_tls/netty_tls/Dockerfile +++ b/internal/test/integration/components/java_tls/netty_tls/Dockerfile @@ -20,7 +20,7 @@ RUN mvn -version RUN mvn clean package # The App Image -FROM eclipse-temurin:25.0.2_10-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9 +FROM eclipse-temurin:21.0.10_7-jre@sha256:34a58218d838035428163eb35abb629944c5906d1bedcfef8bc8864cce11dfe5 EXPOSE 8080 diff --git a/internal/test/integration/components/java_tls/sync_async_tls/Dockerfile b/internal/test/integration/components/java_tls/sync_async_tls/Dockerfile index 152102df9c..b31acc3df8 100644 --- a/internal/test/integration/components/java_tls/sync_async_tls/Dockerfile +++ b/internal/test/integration/components/java_tls/sync_async_tls/Dockerfile @@ -20,7 +20,7 @@ RUN mvn -version RUN mvn clean package # The App Image -FROM eclipse-temurin:25.0.2_10-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9 +FROM eclipse-temurin:21.0.10_7-jre@sha256:34a58218d838035428163eb35abb629944c5906d1bedcfef8bc8864cce11dfe5 EXPOSE 8080 diff --git a/internal/test/integration/components/javakafka-tls/Dockerfile b/internal/test/integration/components/javakafka-tls/Dockerfile index 592b33e4b9..888863366a 100644 --- a/internal/test/integration/components/javakafka-tls/Dockerfile +++ b/internal/test/integration/components/javakafka-tls/Dockerfile @@ -19,7 +19,7 @@ RUN ./mvnw -version RUN ./mvnw package # The App Image -FROM eclipse-temurin:25.0.2_10-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9 +FROM eclipse-temurin:21.0.10_7-jre@sha256:34a58218d838035428163eb35abb629944c5906d1bedcfef8bc8864cce11dfe5 EXPOSE 8080 diff --git a/internal/test/integration/components/javatestserver/Dockerfile_jar b/internal/test/integration/components/javatestserver/Dockerfile_jar index b9cb560b86..0db6ca34e9 100644 --- a/internal/test/integration/components/javatestserver/Dockerfile_jar +++ b/internal/test/integration/components/javatestserver/Dockerfile_jar @@ -1,4 +1,4 @@ -FROM eclipse-temurin:25@sha256:acab08ae09273ee938c1da6111ed60ff51ab0ab18325e4b1b81178039059f86e AS javabuilder +FROM eclipse-temurin:17@sha256:b624cb9175b71aaeb654dd9def666035332d5abf70318537c1a46e61564dbecd AS javabuilder # Install tar and gzip to extract the Maven binaries RUN apt install -y tar gzip @@ -22,7 +22,7 @@ RUN ./mvnw -version RUN ./mvnw clean package # The App Image -FROM eclipse-temurin:25.0.2_10-jre@sha256:0a9c973778b03b88f39ccae4f8cc26022d84a3237a818cb98770369eb6c5daf9 +FROM eclipse-temurin:17.0.18_8-jre@sha256:ff692acf872589e72ca71b416b3e949ec19f35ebe8abb5365d2f31bce298e762 EXPOSE 8085 diff --git a/internal/test/integration/components/mysqldb/Dockerfile b/internal/test/integration/components/mysqldb/Dockerfile index 138b11d412..8ae7fabd66 100644 --- a/internal/test/integration/components/mysqldb/Dockerfile +++ b/internal/test/integration/components/mysqldb/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:9@sha256:e5dc14f6e01c3e577e669337d2855c6d1561b30d8ef2c592e63e4e8a9a52650a as builder +FROM mysql:8@sha256:a2d126916bc2ba79a890a4bf62d305eb8b68fcbdd35c6e582d529df18faf5ebb as builder ENV MYSQL_ROOT_PASSWORD=p_ssW0rd ENV MYSQL_DATABASE=sakila ENV MYSQL_USER=sakila @@ -15,7 +15,7 @@ RUN ["sed", "-i", "s/exec \"$@\"/echo \"skipping...\"/", "/usr/local/bin/docker- USER mysql RUN ["/usr/local/bin/docker-entrypoint.sh", "mysqld"] -FROM mysql:9@sha256:e5dc14f6e01c3e577e669337d2855c6d1561b30d8ef2c592e63e4e8a9a52650a +FROM mysql:8@sha256:a2d126916bc2ba79a890a4bf62d305eb8b68fcbdd35c6e582d529df18faf5ebb ENV MYSQL_ROOT_PASSWORD=p_ssW0rd ENV MYSQL_DATABASE=sakila ENV MYSQL_USER=sakila diff --git a/internal/test/integration/components/nginx-rails-sql/testapi/Dockerfile b/internal/test/integration/components/nginx-rails-sql/testapi/Dockerfile index 6f770e3e22..f909f1315a 100644 --- a/internal/test/integration/components/nginx-rails-sql/testapi/Dockerfile +++ b/internal/test/integration/components/nginx-rails-sql/testapi/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:4.0.1@sha256:3b8c977b1f13501e132a309c903f2f9931e41be4e52785a719490e937953c3de AS builder +FROM ruby:3.4.8@sha256:998b24b17d0e8ac2a9974c11052cba9bb46f8ba519169969492181f262d27a58 AS builder # Set the working directory to /build WORKDIR /build @@ -15,7 +15,7 @@ RUN bundle install EXPOSE 3040 -FROM ruby:4.0.1-slim@sha256:f3207b8383a8ed08a043e960984b756a957f05217f1724f9001712696bfaea88 +FROM ruby:3.4.8-slim@sha256:ff7780d9fc05a54690c722ee0621bae2aa818331be88ebbeb0f5e7bd7cdb7f37 RUN apt-get update && apt-get install -y default-libmysqlclient-dev diff --git a/internal/test/integration/components/nodeclient/Dockerfile b/internal/test/integration/components/nodeclient/Dockerfile index 285bb5f30c..27bfde0634 100644 --- a/internal/test/integration/components/nodeclient/Dockerfile +++ b/internal/test/integration/components/nodeclient/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:20-slim@sha256:d8a35d586fad3af7abb6fdb9ba972388395405f4d462da9e4a4ddcde67b5e0fb # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsdist/Dockerfile_b b/internal/test/integration/components/nodejsdist/Dockerfile_b index 759c2d2905..a52ef6cc62 100644 --- a/internal/test/integration/components/nodejsdist/Dockerfile_b +++ b/internal/test/integration/components/nodejsdist/Dockerfile_b @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:18-slim@sha256:f9ab18e354e6855ae56ef2b290dd225c1e51a564f87584b9bd21dd651838830e # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsdist/Dockerfile_r b/internal/test/integration/components/nodejsdist/Dockerfile_r index f92cf1b7fa..06a76e63bf 100644 --- a/internal/test/integration/components/nodejsdist/Dockerfile_r +++ b/internal/test/integration/components/nodejsdist/Dockerfile_r @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:18-slim@sha256:f9ab18e354e6855ae56ef2b290dd225c1e51a564f87584b9bd21dd651838830e # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodejsserver/Dockerfile b/internal/test/integration/components/nodejsserver/Dockerfile index d51d7c32f4..1d872ffa7a 100644 --- a/internal/test/integration/components/nodejsserver/Dockerfile +++ b/internal/test/integration/components/nodejsserver/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:20-slim@sha256:d8a35d586fad3af7abb6fdb9ba972388395405f4d462da9e4a4ddcde67b5e0fb # Set the working directory to /build WORKDIR / diff --git a/internal/test/integration/components/nodemultiproc/Dockerfile b/internal/test/integration/components/nodemultiproc/Dockerfile index e4e01c2684..bef9a4e1ca 100644 --- a/internal/test/integration/components/nodemultiproc/Dockerfile +++ b/internal/test/integration/components/nodemultiproc/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:20-slim@sha256:d8a35d586fad3af7abb6fdb9ba972388395405f4d462da9e4a4ddcde67b5e0fb WORKDIR /app diff --git a/internal/test/integration/components/redis/Dockerfile b/internal/test/integration/components/redis/Dockerfile index 1fa7e307c1..febaf6ed3f 100644 --- a/internal/test/integration/components/redis/Dockerfile +++ b/internal/test/integration/components/redis/Dockerfile @@ -1 +1 @@ -FROM redis:8.6.1@sha256:1c054d54ecd1597bba52f4304bca5afbc5565ebe614c5b3d7dc5b7f8a0cd768d \ No newline at end of file +FROM redis:7.4.8@sha256:387977b505c656572e08163141edbfe89e6d2434316569a2bbeaae5cfeba388f \ No newline at end of file diff --git a/internal/test/integration/components/rubytestserver/testapi/Dockerfile b/internal/test/integration/components/rubytestserver/testapi/Dockerfile index f2ba983a15..27ef317225 100644 --- a/internal/test/integration/components/rubytestserver/testapi/Dockerfile +++ b/internal/test/integration/components/rubytestserver/testapi/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:4.0.1@sha256:3b8c977b1f13501e132a309c903f2f9931e41be4e52785a719490e937953c3de AS builder +FROM ruby:3.4.8@sha256:998b24b17d0e8ac2a9974c11052cba9bb46f8ba519169969492181f262d27a58 AS builder # Set the working directory to /build WORKDIR /build @@ -14,7 +14,7 @@ RUN bundle install RUN bundle binstubs railties RUN bundle exec rake db:migrate -FROM ruby:4.0.1-slim@sha256:f3207b8383a8ed08a043e960984b756a957f05217f1724f9001712696bfaea88 +FROM ruby:3.4.8-slim@sha256:ff7780d9fc05a54690c722ee0621bae2aa818331be88ebbeb0f5e7bd7cdb7f37 RUN gem update --system diff --git a/internal/test/integration/components/rubytestserver/testapi/Dockerfile_tls b/internal/test/integration/components/rubytestserver/testapi/Dockerfile_tls index 907f946822..ad0220a5c3 100644 --- a/internal/test/integration/components/rubytestserver/testapi/Dockerfile_tls +++ b/internal/test/integration/components/rubytestserver/testapi/Dockerfile_tls @@ -1,4 +1,4 @@ -FROM ruby:4.0.1@sha256:3b8c977b1f13501e132a309c903f2f9931e41be4e52785a719490e937953c3de AS builder +FROM ruby:3.4.8@sha256:998b24b17d0e8ac2a9974c11052cba9bb46f8ba519169969492181f262d27a58 AS builder # Set the working directory to /build WORKDIR /build @@ -14,7 +14,7 @@ RUN bundle install RUN bundle binstubs railties RUN bundle exec rake db:migrate -FROM ruby:4.0.1-slim@sha256:f3207b8383a8ed08a043e960984b756a957f05217f1724f9001712696bfaea88 +FROM ruby:3.4.8-slim@sha256:ff7780d9fc05a54690c722ee0621bae2aa818331be88ebbeb0f5e7bd7cdb7f37 RUN gem update --system diff --git a/internal/test/integration/components/rustssltestserver/Dockerfile b/internal/test/integration/components/rustssltestserver/Dockerfile index 4bd0f6b337..04f0264cc2 100644 --- a/internal/test/integration/components/rustssltestserver/Dockerfile +++ b/internal/test/integration/components/rustssltestserver/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie@sha256:3615a749858a1cba49b408fb49c37093db813321355a9ab7c1f9f4836341e9db AS rustbuilder +FROM debian:bookworm@sha256:0a5bf4ecacfc050bad0131c8e1401063fd1e8343a418723f6dbd3cd13a7b9e33 AS rustbuilder RUN apt update RUN apt install -y build-essential curl pkg-config libssl-dev diff --git a/internal/test/integration/components/testserver/Dockerfile_static b/internal/test/integration/components/testserver/Dockerfile_static index 8a67668d5a..74b16d9a00 100644 --- a/internal/test/integration/components/testserver/Dockerfile_static +++ b/internal/test/integration/components/testserver/Dockerfile_static @@ -19,7 +19,7 @@ RUN go build -tags -a -ldflags '-linkmode external -extldflags "-static"' -o tes # Create final image from minimal + built binary #TODO: use minimal image -FROM debian:13@sha256:3615a749858a1cba49b408fb49c37093db813321355a9ab7c1f9f4836341e9db +FROM debian:12@sha256:0a5bf4ecacfc050bad0131c8e1401063fd1e8343a418723f6dbd3cd13a7b9e33 WORKDIR / RUN mkdir -p x509 diff --git a/internal/test/integration/components/tpclient/Dockerfile b/internal/test/integration/components/tpclient/Dockerfile index e0ad45bb73..b5537ba1d9 100644 --- a/internal/test/integration/components/tpclient/Dockerfile +++ b/internal/test/integration/components/tpclient/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24-slim@sha256:e8e2e91b1378f83c5b2dd15f0247f34110e2fe895f6ca7719dbb780f929368eb +FROM node:20-slim@sha256:d8a35d586fad3af7abb6fdb9ba972388395405f4d462da9e4a4ddcde67b5e0fb WORKDIR /app