fixed dos 2 unix issues

lukeway · Apr 26, 2017 · ca50fca · ca50fca
1 parent 33a74ba
commit ca50fca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/developer-tools/java-debugging/docker-compose.yml b/developer-tools/java-debugging/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2"
 
 services:
 
@@ -30,3 +30,4 @@ services:
       - "8000:8000"
     restart: always
 
+
diff --git a/developer-tools/java-debugging/registration-database/Dockerfile b/developer-tools/java-debugging/registration-database/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:5.6
+FROM mysql:latest
 
 # Copy the database initialize script: 
 # Contents of /docker-entrypoint-initdb.d are run on mysqld startup

diff --git a/...r-tools/java-debugging/registration-database/docker-entrypoint-initdb.d/initialize_db.sql b/...r-tools/java-debugging/registration-database/docker-entrypoint-initdb.d/initialize_db.sql
@@ -2,7 +2,7 @@ USE `dockercon2035`;
 
 CREATE TABLE `user` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `dateOfBirth` datetime NOT NULL,
+  `dateOfBirth` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ,
   `emailAddress` varchar(255) NOT NULL,
   `firstName` varchar(255) NOT NULL,
   `lastName` varchar(255) NOT NULL,

diff --git a/developer-tools/java-debugging/registration-webserver/tomcat/run.sh b/developer-tools/java-debugging/registration-webserver/tomcat/run.sh
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
-exec ${CATALINA_HOME}/bin/catalina.sh jpda run
+exec ${CATALINA_HOME}/bin/catalina.sh jpda run