diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 7559d4f9de7b1..59858b335e9ac 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -10,6 +10,7 @@ 1. Proxy Native: Change the Base Docker Image of ShardingSphere Proxy Native - [#33263](https://github.com/apache/shardingsphere/issues/33263) 1. Proxy: Add query parameters and check for mysql kill processId - [#33274](https://github.com/apache/shardingsphere/pull/33274) 1. SQL Parser: Support parsing Doris INSTR - [#33289](https://github.com/apache/shardingsphere/pull/33289) +1. Agent: Simplify the use of Agent's Docker Image - [#33356](https://github.com/apache/shardingsphere/pull/33356) ### Bug Fixes diff --git a/distribution/agent/Dockerfile b/distribution/agent/Dockerfile index ec61e829ec2d8..bfb28814296f4 100644 --- a/distribution/agent/Dockerfile +++ b/distribution/agent/Dockerfile @@ -14,7 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -FROM eclipse-temurin:22-jdk +FROM eclipse-temurin:23-jdk LABEL org.opencontainers.image.authors="ShardingSphere dev@shardingsphere.apache.org" -ARG APP_NAME -ADD target/${APP_NAME} /usr +ARG DIRECTORY_NAME +ARG JAR_NAME +ADD target/${DIRECTORY_NAME} /usr +RUN mv /usr/agent/${JAR_NAME} /usr/agent/shardingsphere-agent.jar diff --git a/distribution/agent/pom.xml b/distribution/agent/pom.xml index 32c95b9a4f089..71441bc60364b 100644 --- a/distribution/agent/pom.xml +++ b/distribution/agent/pom.xml @@ -120,7 +120,9 @@ build --build-arg - APP_NAME=apache-shardingsphere-${project.version}-shardingsphere-agent-bin + DIRECTORY_NAME=apache-shardingsphere-${project.version}-shardingsphere-agent-bin + --build-arg + JAR_NAME=shardingsphere-agent-${project.version}.jar . -t apache/shardingsphere-agent:${project.version} @@ -184,7 +186,9 @@ --platform linux/amd64,linux/arm64 --build-arg - APP_NAME=apache-shardingsphere-${project.version}-shardingsphere-agent-bin + DIRECTORY_NAME=apache-shardingsphere-${project.version}-shardingsphere-agent-bin + --build-arg + JAR_NAME=shardingsphere-agent-${project.version}.jar . -t ${agent.image.repository}:${agent.image.tag} diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md index baf4be3b7c3cc..70c800697118f 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md @@ -149,12 +149,8 @@ docker network create example-net docker run --rm -d \ --name jaeger \ -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 \ - -p 16686:16686 \ - -p 4317:4317 \ - -p 4318:4318 \ - -p 9411:9411 \ --network example-net \ - jaegertracing/all-in-one:1.60.0 + jaegertracing/all-in-one:1.62.0 ``` 2. 假设 `./custom-agent.yaml` 包含 ShardingSphere Agent 的配置，内容可能如下， @@ -175,7 +171,7 @@ plugins: FROM ghcr.io/apache/shardingsphere-agent:latest COPY ./target/example.jar /app.jar COPY ./custom-agent.yaml /usr/agent/conf/agent.yaml -ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent-5.5.2-SNAPSHOT.jar","-jar","/app.jar"] +ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent.jar","-jar","/app.jar"] ``` 如果是通过本地构建 `apache/shardingsphere-agent:latest` 的 Docker Image，`Dockerfile` 可能如下， @@ -184,7 +180,7 @@ ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent-5.5.2-SNAPSHOT.ja FROM apache/shardingsphere-agent:latest COPY ./target/example.jar /app.jar COPY ./custom-agent.yaml /usr/agent/conf/agent.yaml -ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent-5.5.2-SNAPSHOT.jar","-jar","/app.jar"] +ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent.jar","-jar","/app.jar"] ``` 4. 享受它， diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md index addf123af4d70..e34503f9cbda1 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md @@ -151,12 +151,8 @@ docker network create example-net docker run --rm -d \ --name jaeger \ -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 \ - -p 16686:16686 \ - -p 4317:4317 \ - -p 4318:4318 \ - -p 9411:9411 \ --network example-net \ - jaegertracing/all-in-one:1.60.0 + jaegertracing/all-in-one:1.62.0 ``` 2. Assume `./custom-agent.yaml` contains the configuration of ShardingSphere Agent, and the content may be as follows, @@ -177,7 +173,7 @@ you can use the ShardingSphere Agent in the nightly built Docker Image for a JAR FROM ghcr.io/apache/shardingsphere-agent:latest COPY ./target/example.jar /app.jar COPY ./custom-agent.yaml /usr/agent/conf/agent.yaml -ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent-5.5.2-SNAPSHOT.jar","-jar","/app.jar "] +ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent.jar","-jar","/app.jar"] ``` If you build the Docker Image of `apache/shardingsphere-agent:latest` locally, the `Dockerfile` may be as follows, @@ -186,7 +182,7 @@ If you build the Docker Image of `apache/shardingsphere-agent:latest` locally, t FROM apache/shardingsphere-agent:latest COPY ./target/example.jar /app.jar COPY ./custom-agent.yaml /usr/agent/conf/agent.yaml -ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent-5.5.2-SNAPSHOT.jar","-jar","/app.jar"] +ENTRYPOINT ["java","-javaagent:/usr/agent/shardingsphere-agent.jar","-jar","/app.jar"] ``` 4. Enjoy it,