Skip to content

Commit eac1ac7

Browse files
authored
Replace openjdk images with amazoncorretto docker images (DataDog#21821)
* Replace openjdk images with amazoncorretto docker images * Use al2 version fro jdk19 that does not use alpine * Update sbt version to fix __xstat64 missing issue * Fix logs validation in docker compose launch * Add curl to the Dockerfile to ensure we can still build the test docker image if the wrapper jar file is removed
1 parent bb588be commit eac1ac7

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

hudi/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def dd_environment():
1616
compose_file = os.path.join(HERE, 'docker', 'docker-compose.yaml')
1717
with docker_run(
1818
compose_file=compose_file,
19-
conditions=[CheckDockerLogs('spark-app-hudi', 'finished: show at script.scala:163')],
19+
conditions=[CheckDockerLogs('spark-app-hudi', 'finished: show at script.scala')],
2020
attempts=5,
2121
attempts_wait=5,
2222
):

hudi/tests/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:8-jdk-alpine
1+
FROM amazoncorretto:8-alpine-jdk
22

33
ARG SPARK_VERSION
44
ARG HADOOP_VERSION
@@ -12,7 +12,7 @@ RUN apk add --no-cache curl bash \
1212
&& rm spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz \
1313
&& cd /
1414

15-
RUN wget -O - https://github.com/sbt/sbt/releases/download/v1.4.1/sbt-1.4.1.tgz | gunzip | tar -x -C /usr/local
15+
RUN wget -O - https://github.com/sbt/sbt/releases/download/v1.9.8/sbt-1.9.8.tgz | gunzip | tar -x -C /usr/local
1616

1717
ENV PATH /usr/local/sbt/bin:${PATH}
1818

quarkus/tests/docker/micrometer-quickstart/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Use the official JDK 19 image as the base image for the build stage
2-
FROM openjdk:19-jdk AS build
2+
FROM amazoncorretto:19-al2-jdk AS build
3+
4+
# Install curl for Maven wrapper downloads (fallback if maven-wrapper.jar is missing)
5+
RUN yum install -y curl && yum clean all
36

47
# Enable preview features
58
ENV JAVA_OPTS="--enable-preview"
@@ -33,7 +36,7 @@ RUN ./mvnw package -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -B -V
3336

3437

3538
# Use the official JDK 19 image as the base image for the runtime stage
36-
FROM openjdk:19-jdk AS runtime
39+
FROM amazoncorretto:19-al2-jdk AS runtime
3740

3841
# Enable preview features
3942
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager --enable-preview"

0 commit comments

Comments
 (0)