From a31eb1d3ebacbc69088542145c2138e8d39eab69 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 7 Jan 2020 15:23:58 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=A2=9E=E5=8A=A0dockerfile=E6=96=B0?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-service/blade-demo/Dockerfile | 11 ++++++++++-
 blade-service/blade-demo/pom.xml    | 18 ++++++++++++++++++
 pom.xml                             | 24 ++++++++++++------------
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/blade-service/blade-demo/Dockerfile b/blade-service/blade-demo/Dockerfile
index c27718dc7..d4b45c9b8 100644
--- a/blade-service/blade-demo/Dockerfile
+++ b/blade-service/blade-demo/Dockerfile
@@ -2,6 +2,15 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER smallchill@163.com
 
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+RUN apk add -U tzdata \
+    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+    && echo "Asia/Shanghai" > /etc/timezone \
+    && apk add --no-cache bash bash-doc bash-completion \
+    && apk del tzdata \
+    && rm -rf /var/cache/apk/*
+
 RUN mkdir -p /blade/desk
 
 WORKDIR /blade/desk
@@ -10,6 +19,6 @@ EXPOSE 8105
 
 ADD ./target/blade-demo.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar
 
 CMD ["--spring.profiles.active=test"]
diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml
index 6e25b622a..fb4d62a9e 100644
--- a/blade-service/blade-demo/pom.xml
+++ b/blade-service/blade-demo/pom.xml
@@ -57,6 +57,24 @@
 
     <build>
         <plugins>
+            <!--<plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <images>
+                        <image>
+                            <name>${docker.image.prefix}/${project.artifactId}</name>
+                            <alias>${project.artifactId}</alias>
+                            <build>
+                                <dockerFile>${project.basedir}\Dockerfile</dockerFile>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 4dd4f56dd..675d42312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,18 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.springblade.platform</groupId>
+                <artifactId>blade-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -58,18 +70,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springblade.platform</groupId>
-                <artifactId>blade-bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springblade</groupId>
-                <artifactId>blade-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>