Skip to content

Commit 5fa41c5

Browse files
funky-eyesfunky-eyes
authored
optimize: merge the packaging processes of namingserver and seata-server (apache#6819)
1 parent e57fa54 commit 5fa41c5

File tree

10 files changed

+124
-151
lines changed

10 files changed

+124
-151
lines changed

‎changes/en-us/2.x.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,9 @@ Add changes here for all PR submitted to the 2.x branch.
8484
- [[#6794](https://github.com/apache/incubator-seata/pull/6794)] optimize NacosMockTest UT case
8585
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)] optimize `tableMeta` cache scheduled refresh issue
8686
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
87+
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
8788
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
88-
89+
8990

9091
### refactor:
9192

‎changes/zh-cn/2.x.md

+2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@
8383
- [[#6793](https://github.com/apache/incubator-seata/pull/6795)] 独立server的meta信息初始化逻辑
8484
- [[#6806](https://github.com/apache/incubator-seata/pull/6806)] 优化`tableMeta`缓存定时刷新问题
8585
- [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
86+
- [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
8687
- [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
8788

89+
8890
### refactor:
8991

9092

‎codecov.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#
12
# Licensed to the Apache Software Foundation (ASF) under one or more
23
# contributor license agreements. See the NOTICE file distributed with
34
# this work for additional information regarding copyright ownership.

‎distribution/docker/namingserver/Dockerfile

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
# the Dockerfile support x86 & arrch64
19+
# build：
20+
# 1. mvn -Prelease-seata -Dmaven.test.skip=true clean install -U
21+
# 2. cd distribution/target/apache-seata-x.x.x-SNAPSHOT-incubating-bin/seata-namingserver/
22+
# 3. docker build --no-cache --build-arg SEATA_VERSION=2.2.0-SNAPSHOT -t seata-namingserver:2.2.0-dev .
23+
#
24+
# run:
25+
# 1. docker run --name=seata-namingserver -d seata-namingserver:2.2.0-dev
26+
#
27+
# https://hub.docker.com/r/apache/seata-namingserver
28+
FROM openjdk:8u342
29+
30+
# set label
31+
LABEL maintainer="Seata <seata.apache.org>"
32+
33+
WORKDIR /$BASE_DIR
34+
35+
# ADD FORM distribution
36+
ADD bin/ /seata-namingserver/bin
37+
ADD lib/ /seata-namingserver/lib
38+
ADD conf/ /seata-namingserver/conf
39+
ADD target /seata-namingserver/target
40+
ADD ../LICENSE ./LICENSE
41+
ADD ../NOTICE ./LICENSE
42+
43+
# set extra environment
44+
ENV LOADER_PATH="/seata-namingserver/lib"
45+
ENV TZ="Asia/Shanghai"
46+
CMD ["bash","-c","/seata-namingserver/bin/seata-namingserver.sh && tail -f /dev/null"]

‎distribution/Dockerfile ‎distribution/docker/server/Dockerfile

+8-9
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
# the Dockerfile support x86 & arrch64
1919
# build：
2020
# 1. mvn -Prelease-seata -Dmaven.test.skip=true clean install -U
21-
# 2. cd distribution/target/seata-server-xxx/seata/
22-
# 3. docker build --no-cache --build-arg SEATA_VERSION=1.6.0-SNAPSHOT -t seata-server:1.6.0-dev .
21+
# 2. cd distribution/target/apache-seata-x.x.x-SNAPSHOT-incubating-bin/seata-server/
22+
# 3. docker build --no-cache --build-arg SEATA_VERSION=2.2.0-SNAPSHOT -t seata-server:2.2.0-dev .
2323
#
2424
# run:
25-
# 1. docker run --name=seata-server -d seata-server:1.6.0-dev
25+
# 1. docker run --name=seata-server -d seata-server:2.2.0-dev
2626
#
27-
# https://hub.docker.com/orgs/seataio
27+
# https://hub.docker.com/r/apache/seata-server
2828
FROM openjdk:8u342
2929

3030
# set label
@@ -34,13 +34,12 @@ WORKDIR /$BASE_DIR
3434

3535
# ADD FORM distribution
3636
ADD bin/ /seata-server/bin
37-
ADD conf/ /seata-server/conf
3837
ADD ext/ /seata-server/ext
3938
ADD lib/ /seata-server/lib
40-
ADD script/ /seata-server/script
41-
ADD target/ /seata-server/target
42-
ADD LICENSE /seata-server/LICENSE
43-
ADD NOTICE /seata-server/NOTICE
39+
ADD conf/ /seata-server/conf
40+
ADD target /seata-server/target
41+
ADD ../LICENSE ./LICENSE
42+
ADD ../NOTICE ./LICENSE
4443

4544
# set extra environment
4645
ENV LOADER_PATH="/seata-server/lib"

‎distribution/pom.xml

+4-36
Original file line numberDiff line numberDiff line change
@@ -45,57 +45,25 @@
4545
</dependency>
4646
<dependency>
4747
<groupId>org.apache.seata</groupId>
48-
<artifactId>apm-seata-skywalking-plugin</artifactId>
48+
<artifactId>seata-namingserver</artifactId>
4949
<version>${project.version}</version>
5050
</dependency>
51-
</dependencies>
52-
<build>
53-
<finalName>apache-seata</finalName>
54-
<plugins>
55-
<plugin>
56-
<groupId>org.apache.maven.plugins</groupId>
57-
<artifactId>maven-assembly-plugin</artifactId>
58-
<version>${maven-assembly-plugin.version}</version>
59-
<configuration>
60-
<descriptors>
61-
<descriptor>release-seata.xml</descriptor>
62-
</descriptors>
63-
</configuration>
64-
<executions>
65-
<execution>
66-
<id>make-assembly</id>
67-
<phase>install</phase>
68-
<goals>
69-
<goal>single</goal>
70-
</goals>
71-
</execution>
72-
</executions>
73-
</plugin>
74-
</plugins>
75-
</build>
76-
</profile>
77-
<profile>
78-
<id>release-seata-namingserver</id>
79-
<properties>
80-
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
81-
</properties>
82-
<dependencies>
8351
<dependency>
8452
<groupId>org.apache.seata</groupId>
85-
<artifactId>seata-namingserver</artifactId>
53+
<artifactId>apm-seata-skywalking-plugin</artifactId>
8654
<version>${project.version}</version>
8755
</dependency>
8856
</dependencies>
8957
<build>
90-
<finalName>apache-seata-namingserver</finalName>
58+
<finalName>apache-seata</finalName>
9159
<plugins>
9260
<plugin>
9361
<groupId>org.apache.maven.plugins</groupId>
9462
<artifactId>maven-assembly-plugin</artifactId>
9563
<version>${maven-assembly-plugin.version}</version>
9664
<configuration>
9765
<descriptors>
98-
<descriptor>release-seata-namingserver.xml</descriptor>
66+
<descriptor>release-seata.xml</descriptor>
9967
</descriptors>
10068
</configuration>
10169
<executions>

‎distribution/release-seata-namingserver.xml

-86
This file was deleted.

0 commit comments

Comments
 (0)