🐳 Work about Docker. 增强 dockerfile 兼容 docker-compose 支持 fabric8

pig-auth/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pig-auth
 

pig-codegen/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pig-codegen
 

pig-gateway/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pig-gateway
 

pig-monitor/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pig-monitor
 

pig-register/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pig-register
 

pig-upms/pig-upms-biz/Dockerfile

@@ -2,7 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER wangiegie@gmail.com
 
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN mkdir -p /pigx-upms
 

pom.xml

@@ -33,7 +33,7 @@
 	<url>https://www.pig4cloud.com</url>
 
 	<properties>
-		<spring-boot.version>2.2.3.RELEASE</spring-boot.version>
+		<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
 		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
 		<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
 		<spring-platform.version>Cairo-SR8</spring-platform.version>
@@ -48,12 +48,12 @@
 		<jasypt.version>2.1.0</jasypt.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
-		<docker.registry>http://172.17.0.111:2375</docker.registry>
-		<docker.host>172.17.0.111</docker.host>
+		<docker.plugin.version>0.32.0</docker.plugin.version>
+		<docker.host>http://172.17.0.111:2375</docker.host>
+		<docker.registry>172.17.0.111</docker.registry>
 		<docker.namespace>library</docker.namespace>
 		<docker.username>admin</docker.username>
 		<docker.password>Harbor12345</docker.password>
-		<docker.plugin.version>0.32.0</docker.plugin.version>
 	</properties>
 
 	<dependencies>
@@ -191,8 +191,11 @@
 					<artifactId>docker-maven-plugin</artifactId>
 					<version>${docker.plugin.version}</version>
 					<configuration>
+						<!-- Docker Remote Api-->
 						<dockerHost>${docker.host}</dockerHost>
+						<!-- Docker 镜像私服-->
 						<registry>${docker.registry}</registry>
+						<!-- 认证信息-->
 						<authConfig>
 							<push>
 								<username>${docker.username}</username>
@@ -201,7 +204,8 @@
 						</authConfig>
 						<images>
 							<image>
-								<name>${docker.host}/${docker.namespace}/${project.name}:${project.version}</name>
+								<!-- 镜像名称： 172.17.0.111/library/pig-gateway:2.6.3-->
+								<name>${docker.registry}/${docker.namespace}/${project.name}:${project.version}</name>
 								<build>
 									<dockerFile>${project.basedir}/Dockerfile</dockerFile>
 								</build>