From 2f59536c5438153135e042c9418af58a72bb330a Mon Sep 17 00:00:00 2001 From: Mirco Date: Fri, 12 Jul 2024 13:14:37 +0200 Subject: [PATCH] Take local files --- image/Dockerfile => Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename image/Dockerfile => Dockerfile (80%) diff --git a/image/Dockerfile b/Dockerfile similarity index 80% rename from image/Dockerfile rename to Dockerfile index c61826f..6245327 100644 --- a/image/Dockerfile +++ b/Dockerfile @@ -3,9 +3,8 @@ FROM openjdk:22-jdk-slim as build-jar-stage RUN \ --mount=type=cache,target=/var/cache/apt \ - apt-get update && apt-get -qqy upgrade &&\ - apt-get -qqy install git &&\ - git clone --single-branch --branch main https://repo.prod.meissa.de/meissa/ModeratorElection.git /usr/local/src/ModeratorElection + apt-get update && apt-get -qqy upgrade +ADD ./ /usr/local/src/ModeratorElection WORKDIR /usr/local/src/ModeratorElection/ RUN ./gradlew build -Pvaadin.productionMode @@ -16,11 +15,14 @@ WORKDIR /usr/local/src/ModeratorElection/build/libs/ RUN chmod 0740 ./ModeratorElection.jar ENTRYPOINT ["java", "-jar", "./ModeratorElection.jar"] +FROM build-jar-stage AS ci-image-stage +RUN chmod 0740 ./ModeratorElection.jar +ENTRYPOINT ["java", "-jar", "./ModeratorElection.jar"] #build-native-stage FROM ubuntu:latest as build-native-stage -ADD resources /tmp +ADD image/resources /tmp RUN \ --mount=type=cache,target=/var/cache/apt \ /tmp/install.sh