From 2114880713c8795f900e836ed6e72a13e5ed192f Mon Sep 17 00:00:00 2001 From: Sam Quakenbush Date: Fri, 6 Nov 2020 10:30:31 -0700 Subject: [PATCH 1/2] changed versions for docker build --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb80dcf7..7516d279 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat +FROM tomcat:8.5.55-jdk8-openjdk COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index 672bcaca..69888a38 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,6 @@ javavulnlab: - mysql mysql: - image: mysql + image: mysql:5.7 environment: - MYSQL_ROOT_PASSWORD=root From e1acc7432b3efd5bfba4e600f85c6cc57abcafbe Mon Sep 17 00:00:00 2001 From: Sam Quakenbush Date: Fri, 6 Nov 2020 10:39:06 -0700 Subject: [PATCH 2/2] removed jdk install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7516d279..fc1eefc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM tomcat:8.5.55-jdk8-openjdk COPY . . -RUN apt-get update ; apt-get install maven default-jdk -y ; update-alternatives --config javac +RUN apt-get update apt-get install maven -y RUN mvn clean package ; cp target/*.war /usr/local/tomcat/webapps/