diff --git a/blade-auth/Dockerfile b/blade-auth/Dockerfile index 19270053..f0c25153 100644 --- a/blade-auth/Dockerfile +++ b/blade-auth/Dockerfile @@ -1,14 +1,11 @@ -#若构建后验证码接口依旧报错可以将FROM改为如下两种 +#Docker镜像可以选择以下三种，前两种已经内置字体，第三种为原生的openjdk8-openj9镜像 #1.FROM bladex/alpine-java:8_server-jre_cn_unlimited -#2.FROM adoptopenjdk/openjdk8-openj9:jdk8u275-b01_openj9-0.23.0-alpine-slim -#第2点的最新tag可以到该地址查询：https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags?page=1&ordering=last_updated&name=alpine-slim -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +#2.FROM bladex/alpine-java:openjdk8-openj9_cn_slim +#3.FROM adoptopenjdk/openjdk8-openj9:jdk8u262-b10_openj9-0.21.0-alpine-slim +#第3点的tag可以到该地址查询：https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags?page=1&ordering=last_updated&name=alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com - -#验证码字体包 -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories -RUN set -xe && apk --no-cache add ttf-dejavu fontconfig +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/auth diff --git a/blade-gateway/Dockerfile b/blade-gateway/Dockerfile index 8ef44364..35ae9282 100644 --- a/blade-gateway/Dockerfile +++ b/blade-gateway/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/gateway diff --git a/blade-ops/blade-admin/Dockerfile b/blade-ops/blade-admin/Dockerfile index fac1152a..c6d82870 100644 --- a/blade-ops/blade-admin/Dockerfile +++ b/blade-ops/blade-admin/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/admin diff --git a/blade-ops/blade-flow-design/Dockerfile b/blade-ops/blade-flow-design/Dockerfile index 9c2241fc..ba8dd4f4 100644 --- a/blade-ops/blade-flow-design/Dockerfile +++ b/blade-ops/blade-flow-design/Dockerfile @@ -1,6 +1,6 @@ FROM bladex/alpine-java:8_server-jre_cn_unlimited -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/flowdesign diff --git a/blade-ops/blade-flow/Dockerfile b/blade-ops/blade-flow/Dockerfile index 7336c84d..ae270ca6 100644 --- a/blade-ops/blade-flow/Dockerfile +++ b/blade-ops/blade-flow/Dockerfile @@ -1,6 +1,6 @@ FROM bladex/alpine-java:8_server-jre_cn_unlimited -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/flow diff --git a/blade-ops/blade-log/Dockerfile b/blade-ops/blade-log/Dockerfile index 6fed501e..3a131300 100644 --- a/blade-ops/blade-log/Dockerfile +++ b/blade-ops/blade-log/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/log diff --git a/blade-ops/blade-report/Dockerfile b/blade-ops/blade-report/Dockerfile index b84df466..ecab6f2d 100644 --- a/blade-ops/blade-report/Dockerfile +++ b/blade-ops/blade-report/Dockerfile @@ -1,10 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com - -#字体包 -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories -RUN apk add --update font-adobe-100dpi ttf-dejavu fontconfig +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/report diff --git a/blade-ops/blade-resource/Dockerfile b/blade-ops/blade-resource/Dockerfile index 43c0fb12..1a47df24 100644 --- a/blade-ops/blade-resource/Dockerfile +++ b/blade-ops/blade-resource/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/resource diff --git a/blade-ops/blade-swagger/Dockerfile b/blade-ops/blade-swagger/Dockerfile index 60566681..f90c966f 100644 --- a/blade-ops/blade-swagger/Dockerfile +++ b/blade-ops/blade-swagger/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/swagger diff --git a/blade-ops/blade-turbine/Dockerfile b/blade-ops/blade-turbine/Dockerfile index df12fb06..58f418a7 100644 --- a/blade-ops/blade-turbine/Dockerfile +++ b/blade-ops/blade-turbine/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/turbine diff --git a/blade-ops/blade-xxljob-admin/Dockerfile b/blade-ops/blade-xxljob-admin/Dockerfile index 2ad54b62..bb0f7707 100644 --- a/blade-ops/blade-xxljob-admin/Dockerfile +++ b/blade-ops/blade-xxljob-admin/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/xxljob-admin diff --git a/blade-ops/blade-xxljob/Dockerfile b/blade-ops/blade-xxljob/Dockerfile index 42c3d3ae..7870ce78 100644 --- a/blade-ops/blade-xxljob/Dockerfile +++ b/blade-ops/blade-xxljob/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/xxljob diff --git a/blade-service/blade-desk/Dockerfile b/blade-service/blade-desk/Dockerfile index ebe9529e..2efbdfc3 100644 --- a/blade-service/blade-desk/Dockerfile +++ b/blade-service/blade-desk/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/desk diff --git a/blade-service/blade-system/Dockerfile b/blade-service/blade-system/Dockerfile index 3846d41e..a0d72a80 100644 --- a/blade-service/blade-system/Dockerfile +++ b/blade-service/blade-system/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/system diff --git a/blade-service/blade-user/Dockerfile b/blade-service/blade-user/Dockerfile index 4e58e94d..9c40e6c5 100644 --- a/blade-service/blade-user/Dockerfile +++ b/blade-service/blade-user/Dockerfile @@ -1,6 +1,6 @@ -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/user diff --git a/doc/docker/README.md b/doc/docker/README.md index dc5a5c3a..fca904c7 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -80,9 +80,9 @@ ExecStart=/usr/bin/dockerd -H tcp://0.0.0.0:2375 -H unix://var/run/docker.sock ### 5. 在每个需要构建子项目的根目录下加入Dockerfile,内容可参考如下 ``` -FROM adoptopenjdk/openjdk8-openj9:alpine-slim +FROM bladex/alpine-java:openjdk8-openj9_cn_slim -MAINTAINER smallchill@163.com +MAINTAINER bladejava@qq.com RUN mkdir -p /blade/gateway