Skip to content

Commit 980ba23

Browse files
xingfudeshixingfudeshi
authored
optimize:Use the openjdk image of eclipse-temurin as the base image (apache#6918)
1 parent 66bd3a4 commit 980ba23

File tree

8 files changed

+51
-29
lines changed

8 files changed

+51
-29
lines changed

‎.github/workflows/publish-docker.yml

+12-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
java: [ 8, 17 ]
20+
java: [ 8, 17, 21 ]
2121
steps:
2222
# step 1
2323
- name: "Checkout"
@@ -39,10 +39,9 @@ jobs:
3939
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
4040
run: |
4141
if [ "${{ github.ref_name }}" == "develop" ] || [ "${{ github.ref_name }}" == "snapshot" || [ "${{ github.ref_name }}" == "2.x" ]; then
42-
./mvnw -T 4C clean package -Dimage.name=openjdk:8u342 -Pimage -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
42+
./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
4343
else
44-
./mvnw -T 4C clean package -Dimage.name=openjdk:8u342 -Pimage,release-image-based-on-java8 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
45-
./mvnw -T 4C clean package -Dimage.name=openjdk:8u342-slim -Pimage,release-image-based-on-java8-slim -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
44+
./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:8u422-b05-jdk -Pimage,release-image-based-on-java8 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
4645
fi
4746
# step 4 based on java17
4847
- name: "Publish images to DockerHub based on java17"
@@ -51,5 +50,12 @@ jobs:
5150
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
5251
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
5352
run: |
54-
./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2 -Pimage,release-image-based-on-java17 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
55-
./mvnw -T 4C clean package -Dimage.name=openjdk:17.0.2-slim -Pimage,release-image-based-on-java17-slim -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
53+
./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:17.0.12_7-jdk -Pimage,release-image-based-on-java17 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
54+
# step 5 based on java21
55+
- name: "Publish images to DockerHub based on java21"
56+
if: ${{ matrix.java == 21 && github.ref_name != 'develop' && github.ref_name != 'snapshot' && github.ref_name != '2.x' }}
57+
env:
58+
REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
59+
REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
60+
run: |
61+
./mvnw -T 4C clean package -Dimage.name=eclipse-temurin:21.0.4_7-jdk -Pimage,release-image-based-on-java21 -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;

‎.travis.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ language: java
1717
sudo: false # faster builds
1818

1919
jdk:
20-
- openjdk11
2120
- openjdk8
21+
- openjdk17
22+
- openjdk21
2223

2324
cache:
2425
directories:
@@ -28,10 +29,13 @@ install: true
2829

2930
before_script:
3031
- if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then
31-
export IMAGE_NAME="openjdk:8-jre-slim";
32+
export IMAGE_NAME="eclipse-temurin:8u422-b05-jre";
3233
fi
33-
- if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then
34-
export IMAGE_NAME="openjdk:11-jre-stretch";
34+
- if [ "$TRAVIS_JDK_VERSION" == "openjdk17" ]; then
35+
export IMAGE_NAME="eclipse-temurin:17.0.12_7-jre";
36+
fi
37+
- if [ "$TRAVIS_JDK_VERSION" == "openjdk21" ]; then
38+
export IMAGE_NAME="eclipse-temurin:21.0.4_7-jre";
3539
fi
3640

3741
script:

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

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Add changes here for all PR submitted to the 2.x branch.
2626
- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] remove incompatible licenses at build time
2727
- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2 dependency adds test scope
2828
- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] fix some typos in project
29+
- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] Use the openjdk image of eclipse-temurin as the base image
30+
2931

3032

3133
### refactor:
@@ -49,6 +51,7 @@ Thanks to these contributors for their code commits. Please report an unintended
4951
- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
5052
- [dsomehan](https://github.com/dsomehan)
5153
- [psxjoy](https://github.com/psxjoy)
54+
- [xingfudeshi](https://github.com/xingfudeshi)
5255

5356

5457

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
- [[#6905](https://github.com/apache/incubator-seata/pull/6905)] 移除构建期不兼容的 license
2929
- [[#6906](https://github.com/apache/incubator-seata/pull/6906)] h2依赖添加test scope
3030
- [[#6911](https://github.com/apache/incubator-seata/pull/6911)] 修正项目中的部分拼写错误
31-
31+
- [[#6918](https://github.com/apache/incubator-seata/pull/6918)] 使用eclipse-temurin的openjdk镜像作为基础镜像
32+
-
3233

3334
### refactor:
3435

@@ -52,6 +53,7 @@
5253
- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
5354
- [dsomehan](https://github.com/dsomehan)
5455
- [psxjoy](https://github.com/psxjoy)
56+
- [xingfudeshi](https://github.com/xingfudeshi)
5557

5658
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
5759

‎distribution/docker/namingserver/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# 1. docker run --name=seata-namingserver -d seata-namingserver:2.2.0-dev
2626
#
2727
# https://hub.docker.com/r/apache/seata-namingserver
28-
FROM openjdk:8u342
28+
FROM eclipse-temurin:8u422-b05-jdk
2929

3030
# set label
3131
LABEL maintainer="Seata <seata.apache.org>"
@@ -37,8 +37,8 @@ ADD bin/ /seata-namingserver/bin
3737
ADD lib/ /seata-namingserver/lib
3838
ADD conf/ /seata-namingserver/conf
3939
ADD target /seata-namingserver/target
40-
ADD ../LICENSE ./LICENSE
41-
ADD ../NOTICE ./LICENSE
40+
ADD LICENSE /LICENSE
41+
ADD NOTICE /NOTICE
4242

4343
# set extra environment
4444
ENV LOADER_PATH="/seata-namingserver/lib"

‎distribution/docker/server/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# 1. docker run --name=seata-server -d seata-server:2.2.0-dev
2626
#
2727
# https://hub.docker.com/r/apache/seata-server
28-
FROM openjdk:8u342
28+
FROM eclipse-temurin:8u422-b05-jdk
2929

3030
# set label
3131
LABEL maintainer="Seata <seata.apache.org>"
@@ -38,8 +38,8 @@ ADD ext/ /seata-server/ext
3838
ADD lib/ /seata-server/lib
3939
ADD conf/ /seata-server/conf
4040
ADD target /seata-server/target
41-
ADD ../LICENSE ./LICENSE
42-
ADD ../NOTICE ./LICENSE
41+
ADD LICENSE /LICENSE
42+
ADD NOTICE /NOTICE
4343

4444
# set extra environment
4545
ENV LOADER_PATH="/seata-server/lib"

‎distribution/release-seata.xml

+14
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@
105105
<file>
106106
<source>LICENSE</source>
107107
<destName>LICENSE</destName>
108+
<outputDirectory>seata-server/</outputDirectory>
109+
</file>
110+
111+
<file>
112+
<source>LICENSE</source>
113+
<destName>LICENSE</destName>
114+
<outputDirectory>seata-namingserver/</outputDirectory>
108115
</file>
109116

110117
<file>
@@ -115,6 +122,13 @@
115122
<file>
116123
<source>NOTICE</source>
117124
<destName>NOTICE</destName>
125+
<outputDirectory>seata-server/</outputDirectory>
126+
</file>
127+
128+
<file>
129+
<source>NOTICE</source>
130+
<destName>NOTICE</destName>
131+
<outputDirectory>seata-namingserver/</outputDirectory>
118132
</file>
119133

120134
<file>

‎pom.xml

+5-12
Original file line numberDiff line numberDiff line change
@@ -194,30 +194,23 @@
194194
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
195195
</properties>
196196
</profile>
197-
<!-- profile: release-image-based-on-java8-slim -->
198-
<profile>
199-
<id>release-image-based-on-java8-slim</id>
200-
<properties>
201-
<image.tags>${project.version}-slim</image.tags>
202-
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
203-
</properties>
204-
</profile>
205197
<!-- profile: release-image-based-on-java17 -->
206198
<profile>
207199
<id>release-image-based-on-java17</id>
208200
<properties>
209-
<image.tags>${project.version}.jre17</image.tags>
201+
<image.tags>${project.version}.jdk17</image.tags>
210202
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
211203
</properties>
212204
</profile>
213-
<!-- profile: release-image-based-on-java17-slim -->
205+
<!-- profile: release-image-based-on-java21 -->
214206
<profile>
215-
<id>release-image-based-on-java17-slim</id>
207+
<id>release-image-based-on-java21</id>
216208
<properties>
217-
<image.tags>${project.version}.jre17-slim</image.tags>
209+
<image.tags>${project.version}.jdk21</image.tags>
218210
<maven.git-commit-id.skip>false</maven.git-commit-id.skip>
219211
</properties>
220212
</profile>
213+
221214
<!-- profile: checkstyle -->
222215
<profile>
223216
<id>checkstyle</id>

0 commit comments

Comments
 (0)