From ce2f9620b0d13755e52d2a6ee1cd742e633c9184 Mon Sep 17 00:00:00 2001 From: xingfudeshi Date: Fri, 22 Sep 2023 11:54:50 +0800 Subject: [PATCH] optimize: adding meta info to docker image (#5842) --- build/pom.xml | 1 + changes/en-us/2.0.0.md | 3 ++- changes/zh-cn/2.0.0.md | 1 + server/pom.xml | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/build/pom.xml b/build/pom.xml index 56e03fe8833..d2f781868d6 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -111,6 +111,7 @@ 3.0.2 3.0.0 3.2.0 + 4.9.10 2.8.2 1.6.7 diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md index 5a0c7b8bab0..d9b0136f622 100644 --- a/changes/en-us/2.0.0.md +++ b/changes/en-us/2.0.0.md @@ -24,7 +24,8 @@ The version is updated as follows: - [[#3887](https://github.com/seata/seata/pull/3887)] add SQL Server database support in AT mode - [[#4033](https://github.com/seata/seata/pull/4033)] add SQLServer support for Server DB storage mode - [[#5717](https://github.com/seata/seata/pull/5717)] compatible with file.conf and registry.conf configurations in version 1.4.2 and below - +- [[#5842](https://github.com/seata/seata/pull/5842)] adding metainfo to docker image +- ### bugfix: - [[#5677](https://github.com/seata/seata/pull/5677)] fix saga mode serviceTask inputParams json autoType convert exception - [[#5194](https://github.com/seata/seata/pull/5194)] fix wrong keyword order for oracle when creating a table diff --git a/changes/zh-cn/2.0.0.md b/changes/zh-cn/2.0.0.md index 5172223ceca..e49e96d14e4 100644 --- a/changes/zh-cn/2.0.0.md +++ b/changes/zh-cn/2.0.0.md @@ -24,6 +24,7 @@ Seata 是一款开源的分布式事务解决方案,提供高性能和简单 - [[#3887](https://github.com/seata/seata/pull/3887)] 增加AT模式的SQLServer数据库支持 - [[#4033](https://github.com/seata/seata/pull/4033)] 增加ServerDB存储模式的SQLServer支持 - [[#5717](https://github.com/seata/seata/pull/5717)] 兼容1.4.2及以下版本的file.conf/registry.conf配置 +- [[#5842](https://github.com/seata/seata/pull/5842)] 构建docker 镜像时添加相关git信息,方便定位代码关系 ### bugfix: - [[#5677](https://github.com/seata/seata/pull/5677)] 修复saga模式下serviceTask入参autoType转化失败问题 diff --git a/server/pom.xml b/server/pom.xml index 1739822bdf9..8d168d0447c 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -292,6 +292,19 @@ + + pl.project13.maven + git-commit-id-plugin + ${git-commit-id-plugin.version} + + + get-the-git-infos + + revision + + + + com.google.cloud.tools jib-maven-plugin @@ -327,6 +340,11 @@ seata-server + ${git.commit.message.full} + ${git.remote.origin.url} + ${git.commit.id} + ${git.commit.time} + ${project.version} USE_CURRENT_TIMESTAMP