Merge branch 'master' into devel

This commit is contained in:
BrokenFire 2018-01-10 09:53:05 +01:00
commit 316e7b5cbe

View File

@ -1,4 +1,5 @@
FROM debian:latest
#RUN apt-key update
RUN apt-get update
RUN apt-get -y upgrade
RUN apt-get -y install openjdk-8-jre openjdk-8-jdk