Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimize: optimize the packaging of seata-server #3794

Merged
merged 16 commits into from
Jun 18, 2021

Conversation

wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented Jun 1, 2021

optimize: optimize the packaging of seata-server.
优化seata-server的打包方式。


一)Dockerfile错误修复:

  1. lib\ 改正为 target\
  2. LICENSE-BIN 改正为 LICENSE.

二)打包优化:

  1. Dockerfile也打包进seata-server-*.zip

三)其他优化:

  1. 补充spring-boot-maven-plugin的版本号为${spring-boot.version},避免打包时打印警告。
  2. seata-xxx-allseata-all中移除掉,避免maven-shade-plugin合并模块成功却提示了错误信息。

另外还有一个问题,使用docker运行时,直接结束进程了。因为seata-server.sh的启动命令改成后台运行了。请懂这块的大佬帮忙修复一下。
目前,我自己部署时,使用了spring-boot化之前的命令在docker中启动的。

@codecov-commenter
Copy link

codecov-commenter commented Jun 1, 2021

Codecov Report

Merging #3794 (b5c3753) into develop (25385b3) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop    #3794   +/-   ##
==========================================
  Coverage      40.89%   40.89%           
  Complexity      2984     2984           
==========================================
  Files            665      665           
  Lines          22465    22465           
  Branches        2794     2794           
==========================================
  Hits            9188     9188           
  Misses         12429    12429           
  Partials         848      848           

distribution/Dockerfile Show resolved Hide resolved
server/pom.xml Outdated Show resolved Hide resolved
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>seata-compressor-all</artifactId>
Copy link
Contributor Author

@wangliang181230 wangliang181230 Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

把几个seata-xxx-allseata-all中移除掉,使打包时,不会提示error信息。(不影响打包结果)

@wangliang181230 wangliang181230 changed the title bugfix: fix the wrong mapping added in the Dockerfile optimize: optimize the packaging of seata-server Jun 1, 2021
@wangliang181230 wangliang181230 added this to the 1.5.0 milestone Jun 2, 2021
@wangliang181230 wangliang181230 added the module/server server module label Jun 2, 2021
Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@@ -200,11 +185,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.2.0</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

${maven-jar-plugin.version}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

图片
无法使用。因为spring-boot-starter-parent是通过<scope>import</scope>的方式引入依赖的。
spring-boot-starter-parent<properties>是不会引用下来的。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.2.0是我从spring-boot-dependencies:2.3.10.RELEASE里拿到的版本。

@niaoshuai
Copy link
Contributor

LGTM.

Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slievrly slievrly merged commit d790b56 into apache:develop Jun 18, 2021
@wangliang181230 wangliang181230 deleted the bugfix/dockerfile branch June 18, 2021 06:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/server server module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants