summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-10-25 14:53:54 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-10-25 14:53:54 +0200
commitaa9b32f8cd1467e9718959f400f6777e5d71737d (patch)
treeb88bbede15108c6855d7f94ded4c7054df186a72 /Dockerfile
parenteb0e0a3bc557c05a70eead388797ab850ea87366 (diff)
parentb7a71e5b4aa77b41ef41deec2ace42b67a5a13a7 (diff)
merge: Integrate v2.1 progress into public repository
This pull request integrates the changes planned for the v2.1 release of OpenDC into the public Github repository in order to sync the progress of both repositories.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 9fc64b41..bb9a0d0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:15-slim
+FROM openjdk:16-slim
MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com>
# Obtain (cache) Gradle wrapper
@@ -11,7 +11,7 @@ RUN ./gradlew --version
COPY ./ /app/
RUN ./gradlew --no-daemon :installDist
-FROM openjdk:15-slim
+FROM openjdk:16-slim
COPY --from=0 /app/build/install /opt/
COPY --from=0 /app/traces /opt/opendc/traces
WORKDIR /opt/opendc