Skip to content

Commit

Permalink
containers: replace deprecated openjdk baseimage
Browse files Browse the repository at this point in the history
  • Loading branch information
b-fein committed Jan 18, 2024
1 parent c3f540b commit c647e55
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docker/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80", "--proxy-headers"]
6 changes: 3 additions & 3 deletions docker/bamboo-generator/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
ENTRYPOINT ["java", "-jar", "bamboo-generator.jar"]
4 changes: 2 additions & 2 deletions docker/cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
CMD ["-h"]

0 comments on commit c647e55

Please sign in to comment.