V1.1.7

7fd9cbfb · 张永 · 8781d187 · 7fd9cbfb · 7fd9cbfb · 7fd9cbfb
Commit 7fd9cbfb authored Jan 16, 2024 by 张永
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 13 deletions

Dockerfile Dockerfile +5 -10

Dockerfile_bak Dockerfile_bak +0 -0

pom.xml pom.xml +1 -1

redmine.html src/main/resources/templates/redmine.html +0 -2

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,16 +8,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
 
 ENV LANG C.UTF-8

-
-ARG JAVA_ARG
-ENV JAVA_OPTS=$JAVA_ARG
-
 ARG JAR_FILE
 ADD target/${JAR_FILE} /data/app.jar
-ENV jar /data/app.jar
-ENV workdir /data/
-RUN mkdir -p ${workdir}
-COPY ${jar} ${workdir}
-WORKDIR ${workdir}
+#ENTRYPOINT ["java", "-jar","/data/app.jar"]
+
+#定义jvm参数变量
+ENV JAVA_OPTS="-server -Xms1024m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"

-ENTRYPOINT ["sh", "-ec", "exec java  ${JAVA_OPTS} -jar ${jar} "]
\ No newline at end of file
+ENTRYPOINT java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /data/app.jar
--- a/Dockerfile2
+++ b/Dockerfile2
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,7 @@
 				</executions>
 				<configuration>
 					<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
-					<tag>V1.1.8</tag>
+					<tag>V1.1.7</tag>
 					<buildArgs>
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>

--- a/src/main/resources/templates/redmine.html
+++ b/src/main/resources/templates/redmine.html
@@ -24,8 +24,6 @@
 </head>
 <body>
 	<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>
 		 <p class="title">1.订单详情返回payData改为过滤补款记录</p> 
 	     <el-divider content-position="left">V1.1.6 2024-1-4</el-divider>