You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/27 04:56:08 UTC

(shardingsphere) branch master updated: Rename database image properties to use 'docker' prefix (#36727)

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new eab125c808f Rename database image properties to use 'docker' prefix (#36727)
eab125c808f is described below

commit eab125c808f82f46f7f4c028d78dee09f82c2d6a
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Sep 27 12:56:02 2025 +0800

    Rename database image properties to use 'docker' prefix (#36727)
---
 .github/workflows/e2e-operation.yml                |  8 +--
 .github/workflows/nightly-e2e-operation.yml        | 24 ++++-----
 .../test-manual/integration-test/_index.cn.md      |  2 +-
 .../test-manual/integration-test/_index.en.md      |  4 +-
 .../test-manual/pipeline-e2e-test/_index.cn.md     |  4 +-
 .../test-manual/pipeline-e2e-test/_index.en.md     |  4 +-
 .../test/e2e/env/runtime/E2ETestEnvironment.java   |  4 ++
 .../e2e/env/runtime/type/ArtifactEnvironment.java  | 28 -----------
 .../runtime/type/DockerDatabaseEnvironment.java    | 58 ++++++++++++++++++++++
 .../pipeline/env/PipelineE2EEnvironment.java       |  2 +-
 .../src/test/resources/env/e2e-env.properties      | 12 ++---
 .../engine/base/TransactionBaseE2EIT.java          |  2 +-
 .../src/test/resources/env/e2e-env.properties      | 12 ++---
 .../compose/mode/ClusterContainerComposer.java     |  2 +-
 .../compose/mode/StandaloneContainerComposer.java  |  2 +-
 .../sql/src/test/resources/env/e2e-env.properties  |  2 +-
 16 files changed, 102 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/e2e-operation.yml b/.github/workflows/e2e-operation.yml
index 18b2b190cc3..39a797de317 100644
--- a/.github/workflows/e2e-operation.yml
+++ b/.github/workflows/e2e-operation.yml
@@ -59,14 +59,14 @@ jobs:
       fail-fast: false
       matrix:
         operation: [ transaction, pipeline, showprocesslist ]
-        image: [ { type: "e2e.artifact.database.mysql.image", version: "mysql:5.7" }, { type: "e2e.artifact.database.postgresql.image", version: "postgres:12-alpine" }, { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" } ]
+        image: [ { type: "e2e.docker.database.mysql.image", version: "mysql:5.7" }, { type: "e2e.docker.database.postgresql.image", version: "postgres:12-alpine" }, { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" } ]
         exclude:
           - operation: transaction
-            image: { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" }
+            image: { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" }
           - operation: showprocesslist
-            image: { type: "e2e.artifact.database.postgresql.image", version: "postgres:12-alpine" }
+            image: { type: "e2e.docker.database.postgresql.image", version: "postgres:12-alpine" }
           - operation: showprocesslist
-            image: { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" }
+            image: { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" }
     steps:
       - env:
           changed_operations: ${{ needs.detect-changed-files.outputs.changed_operations }}
diff --git a/.github/workflows/nightly-e2e-operation.yml b/.github/workflows/nightly-e2e-operation.yml
index 97583c121bd..373c94eff6b 100644
--- a/.github/workflows/nightly-e2e-operation.yml
+++ b/.github/workflows/nightly-e2e-operation.yml
@@ -47,24 +47,24 @@ jobs:
         java-version: [ 11, 21 ]
         operation: [ transaction, pipeline, showprocesslist ]
         image: [
-          { type: "e2e.artifact.database.mysql.image", version: "mysql:5.7" },
-          { type: "e2e.artifact.database.mysql.image", version: "mysql:8.0" },
-          { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" },
-          { type: "e2e.artifact.database.postgresql.image", version: "postgres:11-alpine" },
-          { type: "e2e.artifact.database.postgresql.image", version: "postgres:12-alpine" },
-          { type: "e2e.artifact.database.postgresql.image", version: "postgres:13-alpine" },
-          { type: "e2e.artifact.database.postgresql.image", version: "postgres:14-alpine" },
-          { type: "e2e.artifact.database.opengauss.image", version: "opengauss/opengauss:3.1.0" }
+          { type: "e2e.docker.database.mysql.image", version: "mysql:5.7" },
+          { type: "e2e.docker.database.mysql.image", version: "mysql:8.0" },
+          { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" },
+          { type: "e2e.docker.database.postgresql.image", version: "postgres:11-alpine" },
+          { type: "e2e.docker.database.postgresql.image", version: "postgres:12-alpine" },
+          { type: "e2e.docker.database.postgresql.image", version: "postgres:13-alpine" },
+          { type: "e2e.docker.database.postgresql.image", version: "postgres:14-alpine" },
+          { type: "e2e.docker.database.opengauss.image", version: "opengauss/opengauss:3.1.0" }
         ]
         exclude:
           - operation: transaction
-            image: { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" }
+            image: { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" }
           - operation: showprocesslist
-            image: { type: "e2e.artifact.database.mariadb.image", version: "mariadb:11" }
+            image: { type: "e2e.docker.database.mariadb.image", version: "mariadb:11" }
           - operation: showprocesslist
-            image: { type: "e2e.artifact.database.postgresql.image", version: "postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine" }
+            image: { type: "e2e.docker.database.postgresql.image", version: "postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine" }
           - operation: showprocesslist
-            image: { type: "e2e.artifact.database.opengauss.image", version: "opengauss/opengauss:3.1.0" }
+            image: { type: "e2e.docker.database.opengauss.image", version: "opengauss/opengauss:3.1.0" }
     steps:
       - uses: actions/checkout@v4
       - name: Retrieve Maven Caches
diff --git a/docs/document/content/test-manual/integration-test/_index.cn.md b/docs/document/content/test-manual/integration-test/_index.cn.md
index 1c243f19c2a..a181c9ff3cd 100644
--- a/docs/document/content/test-manual/integration-test/_index.cn.md
+++ b/docs/document/content/test-manual/integration-test/_index.cn.md
@@ -169,7 +169,7 @@ e2e.artifact.adapters=jdbc
 e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
 
 # 测试数据库的镜像版本
-e2e.artifact.database.mysql.image=mysql:8.2.0
+e2e.docker.database.mysql.image=mysql:8.2.0
 
 # NATIVE 模式下数据库连接信息及账号
 e2e.native.database.host=127.0.0.1
diff --git a/docs/document/content/test-manual/integration-test/_index.en.md b/docs/document/content/test-manual/integration-test/_index.en.md
index 4f737ff9bc5..b27b917d828 100644
--- a/docs/document/content/test-manual/integration-test/_index.en.md
+++ b/docs/document/content/test-manual/integration-test/_index.en.md
@@ -167,8 +167,8 @@ e2e.artifact.adapters=jdbc
 # Database type. Multiple values can be separated by commas. Optional value: H2, MySQL, PostgreSQL, openGauss
 e2e.artifact.databases=H2,MySQL,PostgreSQL,openGauss
 
-# The mirror version of the database
-e2e.artifact.database.mysql.image=mysql:8.2.0
+# The docker image version of the database
+e2e.docker.database.mysql.image=mysql:8.2.0
 
 # Database connection information and account in NATIVE mode
 e2e.native.database.host=127.0.0.1
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
index a5191abe850..a3d366db366 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.cn.md
@@ -92,11 +92,11 @@ e2e.native.database.password=root
 
 ```
 e2e.run.type=DOCKER
-e2e.artifact.database.mysql.image=mysql:5.7
+e2e.docker.database.mysql.image=mysql:5.7
 ```
 
 3. 通过 Maven 运行测试用例。以 MySQL 为例:
 
 ```
-./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml -De2e.run.type=docker -De2e.artifact.database.mysql.image=mysql:5.7
+./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml -De2e.run.type=docker -De2e.docker.database.mysql.image=mysql:5.7
 ```
diff --git a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
index 330573471bf..4540eafbecd 100644
--- a/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
+++ b/docs/document/content/test-manual/pipeline-e2e-test/_index.en.md
@@ -91,12 +91,12 @@ If only test code is modified, you could reuse the existing docker image.
 
 ```
 e2e.run.type=DOCKER
-e2e.artifact.database.mysql.image=mysql:5.7
+e2e.docker.database.mysql.image=mysql:5.7
 ```
 
 3. Run test cases.
 
 Take MySQL as an example:
 ```
-./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml -De2e.run.type=docker -De2e.artifact.database.mysql.image=mysql:5.7
+./mvnw -nsu -B install -f test/e2e/operation/pipeline/pom.xml -De2e.run.type=docker -De2e.docker.database.mysql.image=mysql:5.7
 ```
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index d2ecec851c9..3af244523d2 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime;
 
 import lombok.Getter;
 import org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment;
+import org.apache.shardingsphere.test.e2e.env.runtime.type.DockerDatabaseEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.type.NativeDatabaseEnvironment;
 import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
 
@@ -40,6 +41,8 @@ public final class E2ETestEnvironment {
     
     private final ArtifactEnvironment artifactEnvironment;
     
+    private final DockerDatabaseEnvironment dockerDatabaseEnvironment;
+    
     private final NativeDatabaseEnvironment nativeDatabaseEnvironment;
     
     private E2ETestEnvironment() {
@@ -48,6 +51,7 @@ public final class E2ETestEnvironment {
         scenarios = EnvironmentPropertiesLoader.getListValue(props, "e2e.scenarios");
         runEnvironment = new RunEnvironment(props);
         artifactEnvironment = new ArtifactEnvironment(props);
+        dockerDatabaseEnvironment = new DockerDatabaseEnvironment(props);
         nativeDatabaseEnvironment = new NativeDatabaseEnvironment(props);
     }
     
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
index 6b7d6902be9..1d3de5aa517 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
@@ -17,19 +17,14 @@
 
 package org.apache.shardingsphere.test.e2e.env.runtime.type;
 
-import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.test.e2e.env.runtime.EnvironmentPropertiesLoader;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -47,9 +42,6 @@ public final class ArtifactEnvironment {
     
     private final Collection<DatabaseType> databaseTypes;
     
-    @Getter(AccessLevel.NONE)
-    private final Map<DatabaseType, String> databaseImages;
-    
     private final List<String> proxyPortBindings;
     
     public ArtifactEnvironment(final Properties props) {
@@ -58,29 +50,9 @@ public final class ArtifactEnvironment {
         regCenterType = props.getProperty("e2e.artifact.regcenter");
         databaseTypes = EnvironmentPropertiesLoader.getListValue(props, "e2e.artifact.databases").stream()
                 .map(each -> TypedSPILoader.getService(DatabaseType.class, each.trim())).collect(Collectors.toSet());
-        databaseImages = getDatabaseImages(props);
         proxyPortBindings = EnvironmentPropertiesLoader.getListValue(props, "e2e.artifact.proxy.port.bindings");
     }
     
-    private Map<DatabaseType, String> getDatabaseImages(final Properties props) {
-        Collection<DatabaseType> databaseTypes = ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class);
-        Map<DatabaseType, String> result = new HashMap<>(databaseTypes.size(), 1F);
-        for (DatabaseType each : databaseTypes) {
-            Optional.ofNullable(props.getProperty(String.format("e2e.artifact.database.%s.image", each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
-        }
-        return result;
-    }
-    
-    /**
-     * Get database image.
-     *
-     * @param databaseType database type
-     * @return database image
-     */
-    public String getDatabaseImage(final DatabaseType databaseType) {
-        return databaseImages.get(databaseType);
-    }
-    
     public enum Mode {
         
         STANDALONE, CLUSTER
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerDatabaseEnvironment.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerDatabaseEnvironment.java
new file mode 100644
index 00000000000..2aded673135
--- /dev/null
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/DockerDatabaseEnvironment.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.test.e2e.env.runtime.type;
+
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+
+/**
+ * Docker database environment.
+ */
+public final class DockerDatabaseEnvironment {
+    
+    private final Map<DatabaseType, String> images;
+    
+    public DockerDatabaseEnvironment(final Properties props) {
+        images = getImages(props);
+    }
+    
+    private Map<DatabaseType, String> getImages(final Properties props) {
+        Collection<DatabaseType> databaseTypes = ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class);
+        Map<DatabaseType, String> result = new HashMap<>(databaseTypes.size(), 1F);
+        for (DatabaseType each : databaseTypes) {
+            Optional.ofNullable(props.getProperty(String.format("e2e.docker.database.%s.image", each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
+        }
+        return result;
+    }
+    
+    /**
+     * Get image.
+     *
+     * @param databaseType database type
+     * @return database image
+     */
+    public String getImage(final DatabaseType databaseType) {
+        return images.get(databaseType);
+    }
+}
diff --git a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index 78a43a60214..3384bff240b 100644
--- a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++ b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -63,7 +63,7 @@ public final class PipelineE2EEnvironment {
         if (RunEnvironment.Type.NATIVE == E2ETestEnvironment.getInstance().getRunEnvironment().getType()) {
             return Collections.emptyList();
         }
-        return Arrays.stream(props.getOrDefault(String.format("e2e.artifact.database.%s.image", databaseType.getType().toLowerCase()), "").toString()
+        return Arrays.stream(props.getOrDefault(String.format("e2e.docker.database.%s.image", databaseType.getType().toLowerCase()), "").toString()
                 .split(",")).filter(each -> !Strings.isNullOrEmpty(each)).collect(Collectors.toList());
     }
 }
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
index 6c719d21438..94fc8734002 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/pipeline/src/test/resources/env/e2e-env.properties
@@ -19,12 +19,12 @@ e2e.run.type=
 
 #e2e.pipeline.proxy.type=INTERNAL
 
-#e2e.artifact.database.mysql.image=mysql:5.7,mysql:8.0
-e2e.artifact.database.mysql.image=
-#e2e.artifact.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-e2e.artifact.database.postgresql.image=
-#e2e.artifact.database.opengauss.image=opengauss/opengauss:3.1.0
-e2e.artifact.database.opengauss.image=
+#e2e.docker.database.mysql.image=mysql:5.7,mysql:8.0
+e2e.docker.database.mysql.image=
+#e2e.docker.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+e2e.docker.database.postgresql.image=
+#e2e.docker.database.opengauss.image=opengauss/opengauss:3.1.0
+e2e.docker.database.opengauss.image=
 
 #e2e.native.database.port= MySQL is 3306, PostgreSQL is 5432, openGauss is 5432
 e2e.native.database.port=3306
diff --git a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
index 36c5b149563..3c09b20b214 100644
--- a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
+++ b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -358,7 +358,7 @@ public abstract class TransactionBaseE2EIT {
             if (TEST_CASES.isEmpty()) {
                 log.warn("Transaction test cases are empty.");
             }
-            String databaseVersion = ENV.getArtifactEnvironment().getDatabaseImage(registry.getDatabaseType());
+            String databaseVersion = ENV.getDockerDatabaseEnvironment().getImage(registry.getDatabaseType());
             if (Strings.isNullOrEmpty(databaseVersion)) {
                 return new LinkedList<>();
             }
diff --git a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
index 897b1054e50..af099058950 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/operation/transaction/src/test/resources/env/e2e-env.properties
@@ -30,12 +30,12 @@ e2e.transaction.xa.providers=Atomikos,Narayana
 
 #e2e.artifact.proxy.port.bindings=63308:3308
 
-#e2e.artifact.database.mysql.image=mysql:5.7,mysql:8.0
-e2e.artifact.database.mysql.image=
-#e2e.artifact.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
-e2e.artifact.database.postgresql.image=
-#e2e.artifact.database.opengauss.image=opengauss/opengauss:3.1.0
-e2e.artifact.database.opengauss.image=
+#e2e.docker.database.mysql.image=mysql:5.7,mysql:8.0
+e2e.docker.database.mysql.image=
+#e2e.docker.database.postgresql.image=postgres:10-alpine,postgres:11-alpine,postgres:12-alpine,postgres:13-alpine,postgres:14-alpine
+e2e.docker.database.postgresql.image=
+#e2e.docker.database.opengauss.image=opengauss/opengauss:3.1.0
+e2e.docker.database.opengauss.image=
 
 e2e.native.database.host=127.0.0.1
 e2e.native.database.port=3306
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index d277765ea33..14c145345f3 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -60,7 +60,7 @@ public final class ClusterContainerComposer implements ContainerComposer {
         governanceContainer = containers.registerContainer(new GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class, "ZooKeeper")));
         Type envType = E2ETestEnvironment.getInstance().getRunEnvironment().getType();
         storageContainer = containers.registerContainer(Type.DOCKER == envType
-                ? new DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImage(databaseType),
+                ? new DockerStorageContainer(E2ETestEnvironment.getInstance().getDockerDatabaseEnvironment().getImage(databaseType),
                         DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), scenario)
                 : new NativeStorageContainer(databaseType, scenario));
         AdaptorContainerConfiguration containerConfig = SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster", databaseType);
diff --git a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index 5022827da8f..913b9e25d37 100644
--- a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
+++ b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -52,7 +52,7 @@ public final class StandaloneContainerComposer implements ContainerComposer {
         containers = new E2EContainers(scenario);
         Type envType = E2ETestEnvironment.getInstance().getRunEnvironment().getType();
         storageContainer = containers.registerContainer(Type.DOCKER == envType
-                ? new DockerStorageContainer(E2ETestEnvironment.getInstance().getArtifactEnvironment().getDatabaseImage(databaseType),
+                ? new DockerStorageContainer(E2ETestEnvironment.getInstance().getDockerDatabaseEnvironment().getImage(databaseType),
                         DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType), scenario)
                 : new NativeStorageContainer(databaseType, scenario));
         AdaptorContainerConfiguration containerConfig = SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone", databaseType);
diff --git a/test/e2e/sql/src/test/resources/env/e2e-env.properties b/test/e2e/sql/src/test/resources/env/e2e-env.properties
index 81e640b9bd3..3a6c4ebea6a 100644
--- a/test/e2e/sql/src/test/resources/env/e2e-env.properties
+++ b/test/e2e/sql/src/test/resources/env/e2e-env.properties
@@ -36,7 +36,7 @@ e2e.artifact.regcenter=
 #e2e.artifact.databases=MySQL,PostgreSQL,openGauss,Hive
 e2e.artifact.databases=
 
-#e2e.artifact.database.mysql.image=mysql:8.2.0
+#e2e.docker.database.mysql.image=mysql:8.2.0
 
 #e2e.artifact.proxy.port.bindings=63308:3308