Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-base/Dockerfile

@@ -0,0 +1,14 @@
+FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+
+MAINTAINER h5u@163.com
+
+RUN mkdir -p /logpm/factory-data-base
+
+WORKDIR /logpm/factory-data-base
+
+EXPOSE 18900
+
+ADD ./target/logpm-factory-data-base.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"]
+CMD ["--spring.profiles.active=test"]

blade-service/logpm-factory-data/logpm-factory-data-zbom/Dockerfile

@@ -0,0 +1,14 @@
+FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+
+MAINTAINER h5u@163.com
+
+RUN mkdir -p /logpm/factory-data-zbom
+
+WORKDIR /logpm/factory-data-zbom
+
+EXPOSE 18910
+
+ADD ./target/logpm-factory-data-zbom.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar","-Xms128m","-Xmx512m", "app.jar"]
+CMD ["--spring.profiles.active=test"]