clean up and added dev compose file

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="com/docker/atsea/controller/RestApiController.java" kind="src" output="target/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>

.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
@@ -9,4 +10,4 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=1.8

README.md

@@ -1,3 +1,4 @@
+![](atsea_store.png)
 #  AtSea Shop Demonstration Application
 
 The AtSea Shop is a demonstration application comprised of: 

app/Dockerfile

@@ -18,4 +18,4 @@ COPY --from=0 /usr/src/atsea/app/react-app/build/ .
 WORKDIR /app
 COPY --from=1 /usr/src/atsea/target/AtSea-0.0.1-SNAPSHOT.jar .
 ENTRYPOINT ["java", "-jar", "/app/AtSea-0.0.1-SNAPSHOT.jar"]
-CMD ["--spring.profiles.active=postgres", "--debug"]
+CMD ["--spring.profiles.active=postgres"]

app/Dockerfile-dev

@@ -0,0 +1,22 @@
+FROM node:latest
+WORKDIR /usr/src/atsea/app/react-app
+COPY app/react-app/package.json .
+RUN npm install
+COPY . /usr/src/atsea
+RUN npm run build
+
+FROM maven:latest
+WORKDIR /usr/src/atsea
+COPY pom.xml .
+RUN mvn -B -f pom.xml -s /usr/share/maven/ref/settings-docker.xml dependency:resolve
+COPY . .
+RUN mvn -B -s /usr/share/maven/ref/settings-docker.xml package -DskipTests
+
+FROM java:8-jdk-alpine
+WORKDIR /static
+COPY --from=0 /usr/src/atsea/app/react-app/build/ .
+WORKDIR /app
+COPY --from=1 /usr/src/atsea/target/AtSea-0.0.1-SNAPSHOT.jar .
+EXPOSE 5005
+ENTRYPOINT ["java", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005","-jar", "/app/AtSea-0.0.1-SNAPSHOT.jar"]
+CMD ["--spring.profiles.active=postgres"]

devsecrets/postgres_password

@@ -1 +1 @@
-gordonpassword
+gordonpass

docker-compose-dev.yml

@@ -0,0 +1,40 @@
+version: "3.1"
+
+services:
+  database:
+    build: 
+       context: ./database
+    image: atsea_db
+    environment:
+      POSTGRES_USER: gordonuser
+      POSTGRES_DB: atsea
+    ports:
+      - "5432:5432" 
+    networks:
+      - back-tier
+    secrets:
+      - postgres_password
+
+  appserver:
+    build:
+       context: .
+       dockerfile: app/Dockerfile-dev
+    image: atsea_app
+    ports:
+      - "8080:8080"
+      - "5005:5005"
+    networks:
+      - front-tier
+      - back-tier
+    secrets:
+      - postgres_password
+
+secrets:
+  postgres_password:
+    file: ./devsecrets/postgres_password
+
+networks:
+  front-tier:
+  back-tier:
+  payment:
+    driver: overlay

docker-compose.yml

@@ -26,6 +26,7 @@ services:
     image: atsea_app
     ports:
       - "8080:8080" 
+      - "5005:5005"
     networks:
       - front-tier
       - back-tier

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.4.3.RELEASE</version>
+    <version>1.5.3.RELEASE</version>
   </parent>
 
   <groupId>com.docker.atsea</groupId>
@@ -89,6 +89,11 @@
     	<artifactId>jjwt</artifactId>
     	<version>0.7.0</version>
 	</dependency>
+	<!-- devtools support -->
+	<dependency>
+    	<groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-devtools</artifactId>
+  </dependency>
 	<!-- Add for tests -->
 	<dependency>
 		<groupId>org.springframework.boot</groupId>
@@ -118,6 +123,9 @@
       <plugin><!-- Create a jar with all dependencies, run commandline using java -jar NAME -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <configuration>
+          <excludeDevtools>true</excludeDevtools>
+        </configuration>
       </plugin>
     </plugins>
   </build>

src/main/java/com/docker/atsea/configuration/JpaConfiguration.java

@@ -63,7 +63,7 @@ public DataSourceProperties dataSourceProperties() {
 		} catch (IOException e) {
 			System.err.println("Could not successfully load DB password file");
 		}
-
+		
 		return dataSourceProperties;
 	}
 

src/main/resources/application.yml

@@ -21,10 +21,18 @@ datasource:
 ---
 spring:
   profiles: postgres
+  devtools:
+    remote:
+      secret: secretkey
+    restart:
+      enabled: true
+    livereload:
+      enabled: true
 datasource:
   atsea:
     url: jdbc:postgresql://database:5432/atsea
     username: gordonuser
+    password: gordonpass
     driverClassName: org.postgresql.Driver
     defaultSchema:
     maxConnections: 300