Merge branch 'dev' into pre-production

9 months ago · a4f04a71d1
20 changed files with 20 additions and 20 deletions
--- a/blade-service/logpm-aftersales/Dockerfile
+++ b/blade-service/logpm-aftersales/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-basic/Dockerfile
+++ b/blade-service/logpm-basic/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-basicdata/Dockerfile
+++ b/blade-service/logpm-basicdata/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-data-sharing/Dockerfile
+++ b/blade-service/logpm-data-sharing/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-distribution/Dockerfile
+++ b/blade-service/logpm-distribution/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-base/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-base/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/Dockerfile
+++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-factory/Dockerfile
+++ b/blade-service/logpm-factory/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-old-project/Dockerfile
+++ b/blade-service/logpm-old-project/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-patch/Dockerfile
+++ b/blade-service/logpm-patch/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-report/Dockerfile
+++ b/blade-service/logpm-report/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-statisticsdata/Dockerfile
+++ b/blade-service/logpm-statisticsdata/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-supervise/Dockerfile
+++ b/blade-service/logpm-supervise/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-trunkline/Dockerfile
+++ b/blade-service/logpm-trunkline/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
--- a/blade-service/logpm-warehouse/Dockerfile
+++ b/blade-service/logpm-warehouse/Dockerfile
@ -1,4 +1,4 @@
-FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+FROM 192.168.2.110:7777/hwy/hwy_base:v1.0
 MAINTAINER h5u@163.com
`@ -1,4 +1,4 @@`
	`FROM bladex/alpine-java:openjdk8-openj9_cn_slim`	`FROM 192.168.2.110:7777/hwy/hwy_base:v1.0`

	`MAINTAINER h5u@163.com`	`MAINTAINER h5u@163.com`