Merge branch 'master' into dev

This commit is contained in:
bwcx_jzy 2022-08-01 17:19:05 +08:00
commit 8d18cb8cce
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5

View File

@ -24,7 +24,9 @@
FROM maven:3.8.5-jdk-8
ENV JPOM_HOME /usr/local/jpom-server
ENV JPOM_PKG server-2.9.6-release.tar.gz
ENV JPOM_PKG_VERSION 2.9.6
ENV JPOM_PKG server-${JPOM_PKG_VERSION}-release.tar.gz
ENV JPOM_DATA_PATH ${JPOM_HOME}/data
ENV JPOM_LOG_PATH ${JPOM_HOME}/log
@ -38,7 +40,7 @@ ENV TZ Asia/Shanghai
RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && echo ${TZ} > /etc/timezone
RUN mkdir -p ${JPOM_HOME} && \
curl -LfSo ${JPOM_HOME}/${JPOM_PKG} https://download.jpom.top/${JPOM_PKG} && \
curl -LfSo ${JPOM_HOME}/${JPOM_PKG} https://download.jpom.top/release/${JPOM_PKG_VERSION}/${JPOM_PKG} && \
tar -zxvf ${JPOM_HOME}/${JPOM_PKG} -C ${JPOM_HOME} && \
rm -rf ${JPOM_HOME}/${JPOM_PKG}