third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tjq 2020-06-23 19:15:04 +08:00
parent 75090e56ad
commit 26c5350ed4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
others/script/jenkins_auto.sh → others/script/jenkins_auto_build.sh
View File

@ -22,15 +22,15 @@ echo "================== 构建 powerjob-agent 镜像 =================="
docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit docker build -t tjqq/powerjob-agent:latest powerjob-worker-agent/. || exit
echo "================== 准备启动 powerjob-server ==================" echo "================== 准备启动 powerjob-server =================="
docker run -d \ docker run -d \
--rm \
--restart=always \ --restart=always \
--name powerjob-server \ --name powerjob-server \
-p 7700:7700 -p 10086:10086 \ -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" \ -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 \ -v ~/docker/powerjob-server:/root/powerjob-server -v ~/.m2:/root/.m2 \
tjqq/powerjob-server:latest 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) serverIP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' powerjob-server)
serverAddress="$serverIP:7700" serverAddress="$serverIP:7700"
echo "使用的Server地址：$serverAddress" echo "使用的Server地址：$serverAddress"

4
powerjob-server/docker/Dockerfile
View File

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

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

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

4
powerjob-worker-agent/Dockerfile
View File

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