From 2c79eb662374f23a29f00fd5aab12e12655370cb Mon Sep 17 00:00:00 2001
From: Arpuplus <34459864+Arpuplus@users.noreply.github.com>
Date: Sun, 30 Dec 2018 12:04:19 +0200
Subject: [PATCH 1/2] Update Dockerfile

---
 oracle-java8/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/oracle-java8/Dockerfile b/oracle-java8/Dockerfile
index 2d9946f..e4c5d34 100644
--- a/oracle-java8/Dockerfile
+++ b/oracle-java8/Dockerfile
@@ -6,7 +6,7 @@
 #
 
 # Pull base image.
-FROM dockerfile/ubuntu
+FROM ubuntu:xenial
 
 # Install Java.
 RUN \
@@ -15,7 +15,8 @@ RUN \
   apt-get update && \
   apt-get install -y oracle-java8-installer && \
   rm -rf /var/lib/apt/lists/* && \
-  rm -rf /var/cache/oracle-jdk8-installer
+  rm -rf /var/cache/oracle-jdk8-installer && \
+  
 
 
 # Define working directory.
@@ -24,5 +25,8 @@ WORKDIR /data
 # Define commonly used JAVA_HOME variable
 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 
+## installing default tomcat8*
+apt install tomcat8 tomcat8-admin tomcat8-examples tomcat8-common tomcat8-docs tomcat8-user
+
 # Define default command.
 CMD ["bash"]

From 0dda0e81fef61d24ab6086cb8efc1494408d7680 Mon Sep 17 00:00:00 2001
From: Arpuplus <34459864+Arpuplus@users.noreply.github.com>
Date: Sun, 30 Dec 2018 12:08:27 +0200
Subject: [PATCH 2/2] Update Dockerfile

---
 oracle-java8/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oracle-java8/Dockerfile b/oracle-java8/Dockerfile
index e4c5d34..d7add66 100644
--- a/oracle-java8/Dockerfile
+++ b/oracle-java8/Dockerfile
@@ -26,7 +26,7 @@ WORKDIR /data
 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 
 ## installing default tomcat8*
-apt install tomcat8 tomcat8-admin tomcat8-examples tomcat8-common tomcat8-docs tomcat8-user
+RUN apt install tomcat8 tomcat8-admin tomcat8-examples tomcat8-common tomcat8-docs tomcat8-user
 
 # Define default command.
 CMD ["bash"]