Skip to content

S
shop
Commit 7fd9cbfb authored by 张永's avatar 张永
Browse files
Options

V1.1.7

parent 8781d187
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
Dockerfile
View file @ 7fd9cbfb
...@@ -8,16 +8,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone ...@@ -8,16 +8,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ARG JAVA_ARG
ENV JAVA_OPTS=$JAVA_ARG
ARG JAR_FILE ARG JAR_FILE
ADD target/${JAR_FILE} /data/app.jar ADD target/${JAR_FILE} /data/app.jar
ENV jar /data/app.jar #ENTRYPOINT ["java", "-jar","/data/app.jar"]
ENV workdir /data/
RUN mkdir -p ${workdir} #定义jvm参数变量
COPY ${jar} ${workdir} ENV JAVA_OPTS="-server -Xms1024m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"
WORKDIR ${workdir}
ENTRYPOINT ["sh", "-ec", "exec java ${JAVA_OPTS} -jar ${jar} "] ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /data/app.jar
\ No newline at end of file
pom.xml
View file @ 7fd9cbfb
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</executions> </executions>
<configuration> <configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository> <repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.8</tag> <tag>V1.1.7</tag>
<buildArgs> <buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE> <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs> </buildArgs>
......
src/main/resources/templates/redmine.html
View file @ 7fd9cbfb
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.8 2024-1-16</el-divider>
<p class="title">1.重写dockerfile,支持张亮的监控jar包</p>
<el-divider content-position="left">V1.1.7 2024-1-11</el-divider> <el-divider content-position="left">V1.1.7 2024-1-11</el-divider>
<p class="title">1.订单详情返回payData改为过滤补款记录</p> <p class="title">1.订单详情返回payData改为过滤补款记录</p>
<el-divider content-position="left">V1.1.6 2024-1-4</el-divider> <el-divider content-position="left">V1.1.6 2024-1-4</el-divider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment