From 5e826f9734680f08d1fc30a34af5d09a3ec3d538 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 27 Nov 2025 08:34:03 +0100 Subject: [PATCH] Use eclipse-temurin image instead of deprecated openjdk --- test/e2e/docker/Dockerfile.tool | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/e2e/docker/Dockerfile.tool b/test/e2e/docker/Dockerfile.tool index 6294f60..45c5ced 100644 --- a/test/e2e/docker/Dockerfile.tool +++ b/test/e2e/docker/Dockerfile.tool @@ -1,4 +1,8 @@ -FROM openjdk:8 +FROM eclipse-temurin:8 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends git \ + && rm -rf /var/lib/apt/lists/* WORKDIR /tests @@ -6,13 +10,11 @@ ARG COMMIT_HASH=b6efe6af0a5499502b8cf8b76c7351e3f172a616 ADD https://github.com/apache/skywalking-agent-test-tool/archive/${COMMIT_HASH}.tar.gz . -RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1 - -RUN rm ${COMMIT_HASH}.tar.gz +RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1 \ + && rm ${COMMIT_HASH}.tar.gz \ + && ./mvnw -B -DskipTests package -RUN ./mvnw -B -DskipTests package - -FROM openjdk:8 +FROM eclipse-temurin:8 EXPOSE 19876 12800 @@ -20,8 +22,7 @@ WORKDIR /tests COPY --from=0 /tests/dist/skywalking-mock-collector.tar.gz /tests -RUN tar -xf skywalking-mock-collector.tar.gz --strip 1 - -RUN chmod +x bin/collector-startup.sh +RUN tar -xf skywalking-mock-collector.tar.gz --strip 1 \ + && chmod +x bin/collector-startup.sh ENTRYPOINT bin/collector-startup.sh