Change the Base Docker Image of ShardingSphere Proxy Native (#33264)

apache · Oct 15, 2024 · 550b90b · 550b90b
1 parent 8b5768b
commit 550b90b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -45,6 +45,7 @@
 1. Infra: Support compiling and using ShardingSphere under OpenJDK 23 - [#33025](https://github.com/apache/shardingsphere/pull/33025)
 1. Hive: Support Hive integration module to connect to HiveServer2 4.0.1 - [#33212](https://github.com/apache/shardingsphere/pull/33212)
 1. Infra: Support building Example module with OpenJDK 23 - [#33224](https://github.com/apache/shardingsphere/pull/33224)
+1. Proxy Native: Change the Base Docker Image of ShardingSphere Proxy Native - [#33263](https://github.com/apache/shardingsphere/issues/33263)
 
 ### Bug Fix
 

diff --git a/distribution/proxy-native/Dockerfile b/distribution/proxy-native/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM oraclelinux:9-slim
+FROM container-registry.oracle.com/os/oraclelinux:9-slim
 LABEL org.opencontainers.image.authors="ShardingSphere [email protected]"
 ENV LOCAL_PATH=/opt/shardingsphere-proxy-native-bin
 ARG OUTPUT_DIRECTORY_NAME

diff --git a/...ent/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md b/...ent/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md
@@ -149,7 +149,8 @@ services:
       - "3307:3307"
 ```
 
-如果用户不对 Git Source 做任何更改，上文提及的命令将使用 `oraclelinux:9-slim` 作为 Base Docker Image。
+如果用户不对 Git Source 做任何更改，
+上文提及的命令将使用 https://container-registry.oracle.com/ords/ocr/ba/os/oraclelinux 中的 `container-registry.oracle.com/os/oraclelinux:9-slim` 作为 Base Docker Image。
 但如果用户希望使用 `scratch`，`alpine:3`，`gcr.io/distroless/base-debian12`，
 `gcr.io/distroless/java-base-debian12` 或 `gcr.io/distroless/static-debian12` 等更小体积的 Docker Image 作为 Base Docker Image，
 用户可能需要根据 https://www.graalvm.org/jdk23/reference-manual/native-image/guides/build-static-executables/ 的要求，

diff --git a/...ent/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md b/...ent/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md
@@ -153,7 +153,8 @@ services:
       - "3307:3307"
 ```
 
-If the user does not make any changes to the Git Source, the command mentioned above will use `oraclelinux:9-slim` as the Base Docker Image.
+If the user does not make any changes to the Git Source, 
+the above mentioned command will use `container-registry.oracle.com/os/oraclelinux:9-slim` in https://container-registry.oracle.com/ords/ocr/ba/os/oraclelinux as the Base Docker Image.
 But if the user wants to use a smaller Docker Image such as `scratch`, `alpine:3`, `gcr.io/distroless/base-debian12`,
 `gcr.io/distroless/java-base-debian12` or `gcr.io/distroless/static-debian12` as the Base Docker Image,
 the user may need to add `--static`, 

diff --git a/...ava/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java b/...ava/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java
@@ -22,7 +22,9 @@
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
 
 import java.util.Arrays;
@@ -35,6 +37,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@EnabledOnJre(value = {JRE.JAVA_21, JRE.JAVA_23}, disabledReason = "This is used to match the requirement of `org.graalvm.polyglot:polyglot:24.1.0`")
 @EnabledIfSystemProperty(named = "java.vm.vendor", matches = "GraalVM Community", disabledReason = "Github Actions device performance is too low")
 @EnabledOnOs(value = OS.LINUX, architectures = "amd64", disabledReason = "See https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too")
 class EspressoInlineExpressionParserTest {