diff --git a/Dockerfile-mysql b/Dockerfile-mysql
deleted file mode 100644
index fa3aefdc..00000000
--- a/Dockerfile-mysql
+++ /dev/null
@@ -1,5 +0,0 @@
-#Base image
-FROM mysql:5.7.28
-
-#COPY
-COPY ./dump/devopsclass.sql /docker-entrypoint-initdb.d
diff --git a/Dockerfile-tomcat b/Dockerfile-tomcat
deleted file mode 100644
index 0cc4017a..00000000
--- a/Dockerfile-tomcat
+++ /dev/null
@@ -1,9 +0,0 @@
-#Base image
-FROM tomcat:8.5
-
-#COPY
-COPY ./target/LoginWebApp.war /usr/local/tomcat/webapps/
-
-WORKDIR /usr/local/tomcat/webapps/
-
-CMD ["catalina.sh", "run"]
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f1f2e9e3..00000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,33 +0,0 @@
-pipeline {
- agent any
- tools {
- maven 'localMaven'
- }
-
- parameters {
- string(name: 'tomcat_stag', defaultValue: '35.154.81.229', description: 'Tomcat Staging Server')
- }
-
-stages{
- stage('Build'){
- steps {
- sh 'mvn clean package'
- }
- post {
- success {
- echo 'Archiving the artifacts'
- archiveArtifacts artifacts: '**/*.war'
- }
- }
- }
-
- stage ('Deployments'){
- stage ('Deploy to Staging Server'){
- steps {
- sh "scp **/*.war jenkins@${params.tomcat_stag}:/usr/share/tomcat/webapps"
- }
- }
- }
- }
- }
-}
diff --git a/docker_compose.yml b/docker_compose.yml
new file mode 100644
index 00000000..617f0f68
--- /dev/null
+++ b/docker_compose.yml
@@ -0,0 +1,15 @@
+---
+version: '3'
+services:
+ db:
+ build:
+ dockerfile: mysql
+ ports:
+ - 3306:3306
+ tomcat:
+ build:
+ dockerfile: tomcat
+ ports:
+ - 8080:8080
+ links:
+ - db
diff --git a/mysql b/mysql
new file mode 100644
index 00000000..19990ed2
--- /dev/null
+++ b/mysql
@@ -0,0 +1,8 @@
+FROM mysql:5.7.28
+
+ENV MYSQL_ROOT_PASSWORD=root
+ENV MYSQL_DATABASE=devopsclass
+ENV MYSQL_USER=ranjit
+ENV MYSQL_PASSWORD=Sunday@2019
+
+COPY devopsclass.sql /docker-entrypoint-initdb.d
diff --git a/pom.xml b/pom.xml
index 86876305..d4aee737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
mysql
mysql-connector-java
- 8.0.12
+ 5.1.46
junit
diff --git a/tomcat b/tomcat
new file mode 100644
index 00000000..2b6d6819
--- /dev/null
+++ b/tomcat
@@ -0,0 +1,2 @@
+FROM tomcat:8.0
+COPY LoginWebApp.war /usr/local/tomcat/webapps/