fixed issue docker#420, set MySQL version, set compile to 1.7

micahblu · Jul 30, 2018 · 5749578 · 5749578
1 parent 90b06dc
commit 5749578
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/developer-tools/java-debugging/app/pom.xml b/developer-tools/java-debugging/app/pom.xml
@@ -68,8 +68,8 @@
 		</dependency>
 	</dependencies>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
 	</properties>
 	<build>
 		<finalName>UserSignup</finalName>

diff --git a/developer-tools/java-debugging/docker-compose.yml b/developer-tools/java-debugging/docker-compose.yml
@@ -30,4 +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:latest
+FROM mysql:5.7
 
 # Copy the database initialize script: 
 # Contents of /docker-entrypoint-initdb.d are run on mysqld startup
@@ -8,4 +8,4 @@ ADD  docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d/
 # ENV MYSQL_ROOT_PASSWORD=my-secret-pw # Not defaulted for security reasons!
 ENV MYSQL_DATABASE=dockercon2035
 ENV MYSQL_USER=gordon
-ENV MYSQL_PASSWORD=password
+ENV MYSQL_PASSWORD=password
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,4 @@ services:
		- "8000:8000"
		restart: always