From b9f64d1ed011af3ed9930a95d89aa1828863b1ee Mon Sep 17 00:00:00 2001 From: lgdd Date: Tue, 16 Apr 2024 08:54:01 +0200 Subject: [PATCH] build(docker): bump to java 17 --- Dockerfile.jvm | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Dockerfile.jvm b/Dockerfile.jvm index e184adf..2a0bf5b 100644 --- a/Dockerfile.jvm +++ b/Dockerfile.jvm @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:11 AS builder +FROM azul/zulu-openjdk-alpine:17 AS builder RUN apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/ --no-cache \ nodejs \ @@ -20,7 +20,7 @@ COPY src src RUN ./mvnw package -FROM azul/zulu-openjdk-alpine:11 +FROM alpine:3.14 ENV DEPLOYMENTS=/deployments ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" @@ -29,14 +29,19 @@ ENV PATH=$PATH:/home/node/.npm-global/bin ENV PATH=$PATH:/home/node/.npm-global/lib ENV NODE_ENV=production -ARG RUN_JAVA_VERSION=1.3.5 +ARG RUN_JAVA_VERSION=1.3.8 + +RUN wget -P /etc/apk/keys/ \ + https://cdn.azul.com/public_keys/alpine-signing@azul.com-5d5dc44c.rsa.pub +RUN echo "https://repos.azul.com/zulu/alpine" | tee -a /etc/apk/repositories RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ - && apk add --no-cache \ + && apk add -U --no-cache \ curl \ nodejs \ npm \ + zulu17-jdk \ && mkdir /deployments \ && chown node $DEPLOYMENTS \ && chmod "g+rwX" $DEPLOYMENTS \ @@ -54,14 +59,16 @@ RUN blade update && \ blade version RUN npm i -g yarn \ - && yarn global add yo + && yarn global add yo@3.1.0 RUN yarn global add generator-old-liferay-theme@npm:generator-liferay-theme@^8.0.0 \ - && yarn global add generator-liferay-theme \ + && yarn global add generator-liferay-theme@10.1.0 \ && yarn global add generator-liferay-js -COPY --from=builder "/workspace/target/lib/*" "$DEPLOYMENTS/lib/" -COPY --from=builder "/workspace/target/*-runner.jar" "$DEPLOYMENTS/app.jar" +COPY --from=builder "/workspace/target/quarkus-app/lib/" "$DEPLOYMENTS/lib/" +COPY --from=builder "/workspace/target/quarkus-app/*.jar" "$DEPLOYMENTS/" +COPY --from=builder "/workspace/target/quarkus-app/app/" "$DEPLOYMENTS/app/" +COPY --from=builder "/workspace/target/quarkus-app/quarkus/" "$DEPLOYMENTS/quarkus/" EXPOSE 8080