[modify] change docker base image to adoptopenjdk to support arm64

others/script/jenkins_auto.sh

@@ -22,15 +22,15 @@ echo "================== 构建 powerjob-agent 镜像 =================="
 docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit
 echo "================== 准备启动 powerjob-server =================="
 docker run -d \
-       --rm \
        --restart=always \
        --name powerjob-server \
        -p 7700:7700 -p 10086:10086 \
        -e PARAMS="--spring.profiles.active=product --spring.datasource.core.jdbc-url=jdbc:mysql://127.0.0.1:3306/powerjob-product?useUnicode=true&characterEncoding=UTF-8 --spring.data.mongodb.uri=mongodb://127.0.0.1:27017/powerjob-product" \
        -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \
        tjqq/powerjob-server:latest
-sleep 60
-echo "================== 准备启动 powerjob-client =================="
+echo "================== powerjob-client 启动完成 =================="
+sleep 45
+echo "================== 准备启动 powerjob-agent =================="
 serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server)
 serverAddress="$serverIP:7700"
 echo "使用的Server地址：$serverAddress"

powerjob-server/docker/Dockerfile

@@ -1,5 +1,5 @@
-# 基础镜像
-FROM openjdk:8
+# 基础镜像（支持 amd64 & arm64）
+FROM adoptopenjdk:8-jdk-hotspot
 # 维护者
 MAINTAINER tengjiqi@gmail.com
 # 下载并安装 maven

powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/DefaultMailAlarmService.java

@@ -65,7 +65,7 @@ public class DefaultMailAlarmService implements Alarmable {
 
             javaMailSender.send(sm);
         }catch (Exception e) {
-            log.error("[OmsMailAlarmService] send mail({}) failed.", sm, e);
+            log.error("[OmsMailAlarmService] send mail({}) failed, reason is {}", sm, e.getMessage());
         }
     }
 }

powerjob-worker-agent/Dockerfile

@@ -1,5 +1,5 @@
-# agent 没有 javac 需求，用 JRE 镜像
-FROM openjdk:8-jre-slim
+# 为了便于使用 arthas，agent 也使用 jdk 而不是 jre
+FROM adoptopenjdk:8-jdk-hotspot
 MAINTAINER tengjiqi@gmail.com
 # 设置时区
 ENV TZ=Asia/Shanghai