Skip to content

Commit 5e826f9

Browse files
committed
Use eclipse-temurin image instead of deprecated openjdk
1 parent 2789813 commit 5e826f9

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

test/e2e/docker/Dockerfile.tool

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
FROM openjdk:8
1+
FROM eclipse-temurin:8
2+
3+
RUN apt-get update \
4+
&& apt-get install -y --no-install-recommends git \
5+
&& rm -rf /var/lib/apt/lists/*
26

37
WORKDIR /tests
48

59
ARG COMMIT_HASH=b6efe6af0a5499502b8cf8b76c7351e3f172a616
610

711
ADD https://github.com/apache/skywalking-agent-test-tool/archive/${COMMIT_HASH}.tar.gz .
812

9-
RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1
10-
11-
RUN rm ${COMMIT_HASH}.tar.gz
13+
RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1 \
14+
&& rm ${COMMIT_HASH}.tar.gz \
15+
&& ./mvnw -B -DskipTests package
1216

13-
RUN ./mvnw -B -DskipTests package
14-
15-
FROM openjdk:8
17+
FROM eclipse-temurin:8
1618

1719
EXPOSE 19876 12800
1820

1921
WORKDIR /tests
2022

2123
COPY --from=0 /tests/dist/skywalking-mock-collector.tar.gz /tests
2224

23-
RUN tar -xf skywalking-mock-collector.tar.gz --strip 1
24-
25-
RUN chmod +x bin/collector-startup.sh
25+
RUN tar -xf skywalking-mock-collector.tar.gz --strip 1 \
26+
&& chmod +x bin/collector-startup.sh
2627

2728
ENTRYPOINT bin/collector-startup.sh

0 commit comments

Comments
 (0)