diff --git a/template/.mvn/wrapper/maven-wrapper.jar b/template/.mvn/wrapper/maven-wrapper.jar index cb28b0e..eebc3c1 100644 Binary files a/template/.mvn/wrapper/maven-wrapper.jar and b/template/.mvn/wrapper/maven-wrapper.jar differ diff --git a/template/.mvn/wrapper/maven-wrapper.properties b/template/.mvn/wrapper/maven-wrapper.properties index 95d441b..a3b0533 100644 --- a/template/.mvn/wrapper/maven-wrapper.properties +++ b/template/.mvn/wrapper/maven-wrapper.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip -distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423 -wrapperUrl=https://maven.aliyun.com/repository/public/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar -wrapperUrlSha256Sum=e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a +distributionUrl=https://maven.aliyun.com/repository/public/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip +distributionSha256Sum=0d7125e8c91097b36edb990ea5934e6c68b4440eef4ea96510a0f6815e7eeadb +wrapperUrl=https://maven.aliyun.com/repository/public/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar +wrapperUrlSha256Sum=4e2fbf6554bc8a4702cdfdd3bef464f423393d784ddbb037216320ce55d5e4e1 diff --git a/template/Dockerfile b/template/Dockerfile index 1a8748a..880461c 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -1,12 +1,12 @@ -FROM maven:3.8.8 AS builder +FROM openjdk:17.0.2-bullseye AS builder WORKDIR source COPY ./ ./ ARG JAR_FILE=entrance/web/target/*.jar -RUN mvn clean package -Dmaven.test.skip=true +RUN ./mvnw clean package -Dmaven.test.skip=true RUN cp ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar ./app.jar extract -FROM openjdk:11.0.14 +FROM openjdk:17.0.2-bullseye WORKDIR /application RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN echo 'Asia/Shanghai' >/etc/timezone @@ -17,4 +17,4 @@ COPY --from=builder source/spring-boot-loader/ ./ COPY --from=builder source/application/ ./ ENV JAVA_OPTS="-Xms512m -Xmx512m" ENV MAIN_CLASS="org.springframework.boot.loader.JarLauncher" -ENTRYPOINT ["sh", "-c", "exec java ${JAVA_OPTS} -Djava.security.egd=file:dev/./urandom ${MAIN_CLASS}"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "exec java ${JAVA_OPTS} -Djava.security.egd=file:dev/./urandom ${MAIN_CLASS}"]