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 @@ + org.apache.maven.plugins maven-antrun-plugin diff --git a/pom.xml b/pom.xml index 4dd4f56dd..675d42312 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,18 @@ + + org.springblade.platform + blade-bom + ${project.version} + pom + import + + + org.springblade + blade-common + ${project.version} + org.springframework.boot spring-boot-dependencies @@ -58,18 +70,6 @@ pom import - - org.springblade.platform - blade-bom - ${project.version} - pom - import - - - org.springblade - blade-common - ${project.version} -