Bläddra i källkod

build(agent): 更新 Agent Dockerfile并添加构建脚本

-将 Agent Dockerfile 中的 base image 从 openjdk:8 更改为 maven:3.9.6-eclipse-temurin-8
- 修改 Agent Dockerfile 中的软件包下载链接为 release 版本
- 在 docker.sh脚本中添加 Agent 服务的构建命令
- 优化 Server Dockerfile 中的环境变量定义和时区设置
bwcx_jzy 5 månader sedan
förälder
incheckning
70b94daf7f

+ 1 - 1
modules/agent/DockerfileBeta

@@ -8,7 +8,7 @@
 # See the Mulan PSL v2 for more details.
 #
 
-FROM openjdk:8
+FROM maven:3.9.6-eclipse-temurin-8
 
 ARG BUILD_DATE
 LABEL build_info="dromara/Jpom build-date:- ${BUILD_DATE}"

+ 3 - 3
modules/agent/DockerfileRelease

@@ -8,7 +8,7 @@
 # See the Mulan PSL v2 for more details.
 #
 
-FROM openjdk:8
+FROM maven:3.9.6-eclipse-temurin-8
 
 ARG BUILD_DATE
 LABEL build_info="dromara/Jpom build-date:- ${BUILD_DATE}"
@@ -33,8 +33,8 @@ RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezo
 
 RUN mkdir -p ${JPOM_HOME}
 #
-RUN curl -LfSo ${JPOM_HOME}/${JPOM_PKG} https://d.jpom.download/beta/${JPOM_PKG_VERSION}/${JPOM_PKG}
-RUN curl -LfsSo ${JPOM_HOME}/${SHA1_NAME} https://d.jpom.download/beta/${JPOM_PKG_VERSION}/${SHA1_NAME} && \
+RUN curl -LfSo ${JPOM_HOME}/${JPOM_PKG} https://d.jpom.download/release/${JPOM_PKG_VERSION}/${JPOM_PKG}
+RUN curl -LfsSo ${JPOM_HOME}/${SHA1_NAME} https://d.jpom.download/release/${JPOM_PKG_VERSION}/${SHA1_NAME} && \
     ESUM=`cat ${JPOM_HOME}/${SHA1_NAME}` && \
     echo "${ESUM} ${JPOM_HOME}/${JPOM_PKG}" | sha1sum -c -;
 RUN tar -zxvf ${JPOM_HOME}/${JPOM_PKG} -C ${JPOM_HOME}

+ 8 - 8
modules/server/DockerfileRelease

@@ -15,22 +15,22 @@ LABEL build_info="dromara/Jpom build-date:- ${BUILD_DATE}"
 LABEL maintainer="bwcx-jzy <bwcx_jzy@163.com>"
 LABEL documentation="https://jpom.top"
 
-ENV JPOM_HOME	/usr/local/jpom-server
-ENV JPOM_PKG_VERSION	2.11.12
-ENV JPOM_PKG	server-${JPOM_PKG_VERSION}-release.tar.gz
-ENV SHA1_NAME server-${JPOM_PKG_VERSION}-release.tar.gz.sha1
+ENV JPOM_HOME=/usr/local/jpom-server
+ENV JPOM_PKG_VERSION=2.11.12
+ENV JPOM_PKG=server-${JPOM_PKG_VERSION}-release.tar.gz
+ENV SHA1_NAME=server-${JPOM_PKG_VERSION}-release.tar.gz.sha1
 
-ENV JPOM_DATA_PATH ${JPOM_HOME}/data
-ENV JPOM_LOG_PATH ${JPOM_HOME}/logs
+ENV JPOM_DATA_PATH=${JPOM_HOME}/data
+ENV JPOM_LOG_PATH=${JPOM_HOME}/logs
 # 数据目录
-ENV jpom.path ${JPOM_DATA_PATH}
+ENV jpom.path=${JPOM_DATA_PATH}
 
 WORKDIR ${JPOM_HOME}
 
 RUN apt-get install -y git
 
 # 时区
-ENV TZ Asia/Shanghai
+ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone
 
 RUN mkdir -p ${JPOM_HOME}

+ 3 - 0
script/docker.sh

@@ -20,6 +20,9 @@
 # 服务端
 docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le -t jpomdocker/jpom:2.11.12 -t jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .
 
+# 插件端
+docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le -t jpomdocker/jpom-agent:2.11.12 -t jpomdocker/jpom-agent:latest -f ./modules/agent/DockerfileRelease --push .
+
 docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le -t registry.cn-chengdu.aliyuncs.com/jpomdocker/jpom:2.11.12 -t registry.cn-chengdu.aliyuncs.com/jpomdocker/jpom:latest -f ./modules/server/DockerfileRelease --push .