caching-approaches-comparison

added java 10+ support

5/30/2019 4:39:18 AM

Rômulo Manciola Meloca

Commit: 72e6738

Tree: 4b468d9

Parents: 2ae9f3d

Changes

docker/docker-compose.yml 2(+1 -1)

docker/Dockerfile 11(+7 -4)

reduce.sh 1(+0 -1)

run.sh 1(+0 -1)

trace.sh 1(+0 -1)

Details

docker/docker-compose.yml 2(+1 -1)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index a08cbc4..848ab57 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - /root/.m2:/root/.m2
     restart: unless-stopped
     ports:
-      - 5001:22
+      - "5001:22"
     logging:
       options:
         max-size: "10m"

docker/Dockerfile 11(+7 -4)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 369f673..5c64e7b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,13 +4,16 @@ RUN apt-get update -qq
 
 RUN apt-get -qq -y install software-properties-common
 
-RUN add-apt-repository ppa:webupd8team/java -y
+RUN add-apt-repository ppa:linuxuprising/java -y
 
 RUN apt-get update -qq
 
 RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
-RUN apt-get -qq -y install oracle-java8-installer
+RUN echo debconf shared/accepted-oracle-license-v1-2 select true | debconf-set-selections
+RUN echo debconf shared/accepted-oracle-license-v1-2 seen true | debconf-set-selections
+RUN apt-get -qq -y install oracle-java12-installer
+
 RUN apt-get -qq -y install maven
 RUN apt-get -qq -y install git
 RUN apt-get -qq -y install netcat
@@ -18,8 +21,8 @@ RUN apt-get -qq -y install netcat
 RUN apt-get -qq -y install ssh
 RUN echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
 RUN mkdir /run/sshd
-RUN echo "root:root" | chpasswd
+RUN echo "root:caching-approaches-comparison" | chpasswd
 
 EXPOSE 22
 
-CMD ["/usr/sbin/sshd", "-D"]
\ No newline at end of file
+CMD ["/usr/sbin/sshd", "-D"]

reduce.sh 1(+0 -1)

diff --git a/reduce.sh b/reduce.sh
index 35aa64a..32840cc 100644
--- a/reduce.sh
+++ b/reduce.sh
@@ -5,7 +5,6 @@ if [ "$(whoami)" != 'root' ]; then
     exit 1;
 fi
 
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
 export JAVA_OPTS="-Xms4096m -Xmx6124m"
 
 host="localhost"

run.sh 1(+0 -1)

diff --git a/run.sh b/run.sh
index 4acfe37..60a2a6a 100644
--- a/run.sh
+++ b/run.sh
@@ -5,7 +5,6 @@ if [ "$(whoami)" != 'root' ]; then
     exit 1;
 fi
 
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
 export JAVA_OPTS="-Xms4096m -Xmx6124m"
 
 host="localhost"

trace.sh 1(+0 -1)

diff --git a/trace.sh b/trace.sh
index a176ac6..5fe8bcf 100644
--- a/trace.sh
+++ b/trace.sh
@@ -5,7 +5,6 @@ if [ "$(whoami)" != 'root' ]; then
     exit 1;
 fi
 
-export JAVA_HOME=/usr/lib/jvm/java-8-oracle
 export JAVA_OPTS="-Xms4096m -Xmx6124m"
 
 host="localhost"