initial commit

ehazlett · ehazlett · commit 754bbf3b61a5 · 2014-11-26T11:09:59.000-05:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+.git
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+*.swp
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,3 @@
+FROM ehazlett/tomcat7
+COPY dbtest /opt/tomcat/webapps/dbtest
+
diff --git a/dbtest/META-INF/context.xml b/dbtest/META-INF/context.xml
@@ -0,0 +1,8 @@
+<Context>
+  <Resource name="jdbc/TestDB" auth="Container" type="javax.sql.DataSource"
+               maxActive="100" maxIdle="30" maxWait="10000"
+               username="java" password="java" driverClassName="com.mysql.jdbc.Driver"
+               url="jdbc:mysql://mysql:3306/javatest"/>
+</Context>
+
+        
diff --git a/dbtest/WEB-INF/lib/jstl.jar b/dbtest/WEB-INF/lib/jstl.jar
diff --git a/dbtest/WEB-INF/lib/mysql.jar b/dbtest/WEB-INF/lib/mysql.jar
diff --git a/dbtest/WEB-INF/lib/standard.jar b/dbtest/WEB-INF/lib/standard.jar
diff --git a/dbtest/WEB-INF/web.xml b/dbtest/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+    version="2.4">
+  <description>MySQL Test App</description>
+  <resource-ref>
+      <description>DB Connection</description>
+      <res-ref-name>jdbc/TestDB</res-ref-name>
+      <res-type>javax.sql.DataSource</res-type>
+      <res-auth>Container</res-auth>
+  </resource-ref>
+</web-app>
diff --git a/dbtest/index.jsp b/dbtest/index.jsp
@@ -0,0 +1,22 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<sql:query var="rs" dataSource="jdbc/TestDB">
+select id, foo, bar from testdata
+</sql:query>
+
+<html>
+  <head>
+    <title>DB Test</title>
+  </head>
+  <body>
+
+  <h2>Results</h2>
+  
+<c:forEach var="row" items="${rs.rows}">
+    Foo ${row.foo}<br/>
+    Bar ${row.bar}<br/>
+</c:forEach>
+
+  </body>
+</html>
diff --git a/fig.yml b/fig.yml
@@ -0,0 +1,25 @@
+db:
+  image: orchardup/mysql
+  environment:
+    MYSQL_USER: java
+    MYSQL_PASSWORD: java
+    MYSQL_DATABASE: javatest
+  ports:
+    - "3306"
+
+dbinit:
+  image: orchardup/mysql
+  entrypoint: /bin/bash
+  volumes:
+    - .:/host
+  command: -c "sleep 4; mysql -u java --password=java -h mysql javatest < /host/init.sql; exit 0"
+  links:
+    - db:mysql
+
+app:
+  build: .
+  links:
+    - dbinit
+    - db:mysql
+  ports:
+    - "8080"
diff --git a/init.sql b/init.sql
@@ -0,0 +1,2 @@
+create table testdata (id int not null auto_increment primary key,foo varchar(25),bar int);
+insert into testdata values(null, 'hello', 12345);
diff --git a/readme.md b/readme.md
@@ -0,0 +1,10 @@
+# Docker Java/MySQL Tomcat Sample
+This is a simple Java application that shows Java and MySQL.
+
+# Run
+
+`fig up -d`
+
+Then run `fig ps` to find the app port.
+
+You should be able to access the app on http://<docker-host-ip>:<app-port>/dbtest

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+FROM ehazlett/tomcat7`
	`2`	`+COPY dbtest /opt/tomcat/webapps/dbtest`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+create table testdata (id int not null auto_increment primary key,foo varchar(25),bar int);`
	`2`	`+insert into testdata values(null, 'hello', 12345);`