Merge branch 'develop' into 'master'

added cfg + changed docker file



See merge request !1

Dockerfile

-FROM drissamri/java:jre8
+FROM 172.16.1.132:5000/ipgallery/base-microservice-java
 
 
 RUN mkdir -p /opt/mcx/config/LocationService
 RUN mkdir -p /opt/mcx/config/LocationService
-RUN mkdir -p /logs/conf
+#RUN mkdir -p /logs/conf
 
 
 COPY build/libs/LocationService-*.jar /usr/
 COPY build/libs/LocationService-*.jar /usr/
-COPY cfg/config.properties /opt/mcx/config/LocationService/
-COPY cfg/log4j.xml /logs/conf/
-COPY script/run.sh /usr/
+COPY cfg/config.properties /opt/mcx/config/
+#COPY cfg/log4j.xml /logs/conf/
+#COPY script/run.sh /usr/
 RUN  chmod +x /usr/run.sh
 RUN  chmod +x /usr/run.sh
 RUN mv /usr/LocationService-*.jar /usr/LocationService.jar
 RUN mv /usr/LocationService-*.jar /usr/LocationService.jar
 
 
@@ -14,4 +14,4 @@ WORKDIR /usr
 
 
 EXPOSE 9090
 EXPOSE 9090
 
 
-ENTRYPOINT ["/usr/run.sh"]
+ENTRYPOINT ["/usr/run.sh","/usr/LocationService.jar"]
\ No newline at end of file

cfg/config.properties

+
+#ds.IpAddress=172.16.1.97:8080
+log4j.prop.file.path=/logs/conf/log4j.xml
+#mcz.files.location=/opt/mcx/config
+### microservice/rest server     
+server.port=32015
+server.host=0.0.0.0
+server.worker.threads=6