From c647e5503e9c5275396012f4dc79c09f36e0e4f5 Mon Sep 17 00:00:00 2001 From: Benedikt Fein Date: Thu, 18 Jan 2024 08:33:35 +0100 Subject: [PATCH] containers: replace deprecated openjdk baseimage --- docker/api/Dockerfile | 4 ++-- docker/bamboo-generator/Dockerfile | 6 +++--- docker/cli/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/api/Dockerfile b/docker/api/Dockerfile index 7349d5c2..ab7884a0 100644 --- a/docker/api/Dockerfile +++ b/docker/api/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-slim as jar-builder +FROM docker.io/library/eclipse-temurin:17-jdk as jar-builder ADD bamboo-generator/ . RUN ./gradlew shadowJar --no-daemon -x :generateJsonSchema2Pojo @@ -24,4 +24,4 @@ RUN rm requirements.txt requirements.in EXPOSE 80 -ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80", "--proxy-headers"] \ No newline at end of file +ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80", "--proxy-headers"] diff --git a/docker/bamboo-generator/Dockerfile b/docker/bamboo-generator/Dockerfile index 9d0764ba..8c330721 100644 --- a/docker/bamboo-generator/Dockerfile +++ b/docker/bamboo-generator/Dockerfile @@ -1,11 +1,11 @@ -FROM openjdk:17-slim as jar-builder +FROM docker.io/library/eclipse-temurin:17-jdk as jar-builder ADD bamboo-generator/ . RUN ./gradlew shadowJar --no-daemon -x :generateJsonSchema2Pojo RUN cp ./build/libs/bamboo-generator*-all.jar bamboo-generator.jar -FROM openjdk:17-slim as runtime +FROM docker.io/library/eclipse-temurin:17-jre as runtime COPY --from=jar-builder /bamboo-generator.jar bamboo-generator.jar EXPOSE 8091 -ENTRYPOINT ["java", "-jar", "bamboo-generator.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "bamboo-generator.jar"] diff --git a/docker/cli/Dockerfile b/docker/cli/Dockerfile index c337dac4..1a16b7eb 100644 --- a/docker/cli/Dockerfile +++ b/docker/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-slim as jar-builder +FROM docker.io/library/eclipse-temurin:17-jdk as jar-builder ADD bamboo-generator/ . RUN ./gradlew shadowJar --no-daemon -x :generateJsonSchema2Pojo @@ -19,4 +19,4 @@ COPY schemas /schemas RUN ln -s /main.py /usr/local/bin/aeolus && chmod +x /usr/local/bin/aeolus ENTRYPOINT ["aeolus"] -CMD ["-h"] \ No newline at end of file +CMD ["-h"]