Merge pull request #4 from AITestingOrg/port-refactor

Updated names (due to docker changes) and made sure port did not rely…

Author: erinyoo

Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:8-jdk-alpine
 MAINTAINER Juan Sotomayor "jsoto128@fiu.edu"
 VOLUME /tmp
-ADD build/libs/microservice--user-service-0.0.1-SNAPSHOT.jar app.jar
+ADD build/libs/user-service-0.0.1-SNAPSHOT.jar app.jar
 ENV JAVA_OPTS=""
 ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

docker-compose.yml

@@ -10,9 +10,9 @@ services:
     environment:
       - 'eviction-interval-timer-in-ms: 1000'
 
-  mysql-server:
+  mysqlserver:
     image: mysql:5.7
-    container_name: mysql-server
+    container_name: mysqlserver
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -25,14 +25,14 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
       MYSQL_DATABASE: 'user_service'
 
-  microservice--user-service:
+  userservice:
     build: ./
     depends_on:
       - discovery-service
-      - mysql-server
-    container_name: microservice--user-service
+      - mysqlserver
+    container_name: userservice
     ports:
-      - '8091:8091'
+      - '8080'
 
 volumes:
    mysql-data:

src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
   profiles: development
 
   datasource:
-    url: jdbc:mysql://mysql-server:3306/user_service
+    url: jdbc:mysql://mysqlserver:3306/user_service
     username: root
     password: root
     driver-class-name: com.mysql.jdbc.Driver
@@ -28,14 +28,14 @@ eureka:
 
 server:
   contextPath:   /auth
-  port: 8091
+  port: ${APP_PORT:8080}
 
 ---
 spring:
   profiles: docker
 
   datasource:
-    url: jdbc:mysql://mysql-server:3306/user_service
+    url: jdbc:mysql://mysqlserver:3306/user_service
     username: root
     password: root
     driver-class-name: com.mysql.jdbc.Driver
@@ -57,7 +57,7 @@ eureka:
 
 server:
   contextPath:   /auth
-  port: 8091
+  port: ${APP_PORT:8080}
 
 
 jpa:

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: user-service
+    name: userservice
   profiles:
     active: development
   cloud: