From 41231746c616ec2e030d27d141aca9b6764b56a8 Mon Sep 17 00:00:00 2001
From: Myristica <17411952+MyristicaFragrans@users.noreply.github.com>
Date: Wed, 5 Oct 2022 10:21:57 -0600
Subject: [PATCH 1/2] Update Docker Compose based on #16

---
 docker-compose.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 672bcaca..c16df15d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,13 @@
-javavulnlab:
-  build: .
-  ports:
-    - 8080:8080
-  links: 
-    - mysql
+version: '3.3'
+services:
+  javavulnlab:
+    build: .
+    ports:
+      - 8080:8080
+    links: 
+      - mysql
 
-mysql:
-  image: mysql
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
+  mysql:
+    image: mysql:5.7
+    environment:
+      - MYSQL_ROOT_PASSWORD=root

From 16bfcd1a187b499db2b66ce98537ca910f371adb Mon Sep 17 00:00:00 2001
From: Myristica <17411952+MyristicaFragrans@users.noreply.github.com>
Date: Wed, 5 Oct 2022 10:22:29 -0600
Subject: [PATCH 2/2] Fix Dockerfile as described in #16

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

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 . .