From bb62b80585b2453529f45b981617e8321b8ded2c Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 29 Oct 2020 17:02:18 +0100 Subject: Add support for Java 15 build --- simulator/Dockerfile | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'simulator/Dockerfile') diff --git a/simulator/Dockerfile b/simulator/Dockerfile index 880af95d..34280a17 100644 --- a/simulator/Dockerfile +++ b/simulator/Dockerfile @@ -1,31 +1,17 @@ -FROM openjdk:14-slim AS staging +FROM openjdk:15-slim MAINTAINER OpenDC Maintainers -# Build staging artifacts for dependency caching -COPY ./ /app -WORKDIR /app -RUN mkdir /staging \ - && cp -r buildSrc/ /staging \ - && cp gradle.properties /staging 2>/dev/null | true \ - && find -name "*.gradle.kts" | xargs cp --parents -t /staging - -FROM openjdk:14-slim AS builder - # Obtain (cache) Gradle wrapper COPY gradlew /app/ COPY gradle /app/gradle WORKDIR /app RUN ./gradlew --version -# Install (cache) project dependencies only -COPY --from=staging /staging/ /app/ -RUN ./gradlew clean build --no-daemon > /dev/null 2>&1 || true - # Build project COPY ./ /app/ RUN ./gradlew --no-daemon :opendc-runner-web:installDist -FROM openjdk:14-slim -COPY --from=builder /app/opendc-runner-web/build/install /app +FROM openjdk:15-slim +COPY --from=0 /app/opendc-runner-web/build/install /app WORKDIR /app CMD opendc-runner-web/bin/opendc-runner-web -- cgit v1.2.3