diff --git a/dsGw/Dockerfile b/dsGw/Dockerfile index bf25b67b..bbf30a65 100644 --- a/dsGw/Dockerfile +++ b/dsGw/Dockerfile @@ -6,18 +6,19 @@ WORKDIR /root # ENV TZ这样的用法通常是用来设置时区环境变量,TZ代表Time Zone ENV TZ=Asia/Shanghai -# 让容器内部正常显示中文 -ENV LANG C.UTF-8 +# 声明变量 +ENV file_name="dsGw-jar-with-dependencies.jar" +# 让容器内部正常显示中文 +ENV LANG=C.UTF-8 -# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 -COPY ./lib /root/lib -COPY ./target /root/target +# 将jar包复制到容器的/root目录下 +COPY $file_name /root/$file_name #设置这个环境变量后,您可以在Docker容器中启动Java应用程序时使用这些参数。 ENV JAVA_OPTS="-Xms1024m -Xmx2048m" # 标识为生产环境 -ENV WORKING_ENV="pro" +ENV WORKING_ENV="dev" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.gw.GwApplication" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar $file_name" ] diff --git a/dsGw/pom.xml b/dsGw/pom.xml index 2733f4e0..ffda6c76 100644 --- a/dsGw/pom.xml +++ b/dsGw/pom.xml @@ -147,9 +147,9 @@ maven-assembly-plugin 3.3.0 - - src/main/resources/package.xml - + + jar-with-dependencies + com.dsideal.base.BaseApplication @@ -166,6 +166,18 @@ + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + none + + + diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile index 752b201e..9d50a491 100644 --- a/dsRes/Dockerfile +++ b/dsRes/Dockerfile @@ -6,18 +6,19 @@ WORKDIR /root # ENV TZ这样的用法通常是用来设置时区环境变量,TZ代表Time Zone ENV TZ=Asia/Shanghai -# 让容器内部正常显示中文 -ENV LANG C.UTF-8 +# 声明变量 +ENV file_name="dsRes-jar-with-dependencies.jar" +# 让容器内部正常显示中文 +ENV LANG=C.UTF-8 -# 将target文件夹下的jar包gw-charge.jar复制到容器的/root目录下 -COPY ./lib /root/lib -COPY ./target /root/target +# 将jar包复制到容器的/root目录下 +COPY $file_name /root/$file_name #设置这个环境变量后,您可以在Docker容器中启动Java应用程序时使用这些参数。 ENV JAVA_OPTS="-Xms1024m -Xmx2048m" # 标识为生产环境 -ENV WORKING_ENV="pro" +ENV WORKING_ENV="dev" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.resource.ResApplication" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -jar $file_name" ] diff --git a/dsRes/pom.xml b/dsRes/pom.xml index 5472a8e9..8e476fa8 100644 --- a/dsRes/pom.xml +++ b/dsRes/pom.xml @@ -59,12 +59,6 @@ japidocs 1.4.4 - - - com.google.code.gson - gson - 2.11.0 - javax.xml.bind jaxb-api @@ -92,11 +86,6 @@ jackson-core 2.17.2 - - com.fasterxml.jackson.core - jackson-databind - 2.17.2 - net.sf.json-lib @@ -191,13 +180,6 @@ 2.20.0 - - - org.slf4j - slf4j-simple - 1.7.36 - - com.fasterxml.jackson.core jackson-databind @@ -244,11 +226,7 @@ jjwt 0.7.0 - - javax.xml.bind - jaxb-api - 2.3.0 - + com.sun.xml.bind jaxb-impl @@ -259,11 +237,6 @@ jaxb-core 2.3.0 - - javax.activation - activation - 1.1.1 - @@ -294,9 +267,9 @@ maven-assembly-plugin 3.3.0 - - src/main/resources/package.xml - + + jar-with-dependencies + com.dsideal.base.BaseApplication @@ -313,6 +286,18 @@ + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + default-jar + none + + + \ No newline at end of file