Change docker image to the official one from oracle repository (#350)

oracle · Jul 25, 2023 · bb9d7ea · bb9d7ea
1 parent 454defe
commit bb9d7ea
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt b/tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt
@@ -1 +1 @@
-mysql/mysql-server:8.0
+container-registry.oracle.com/mysql/community-server:8.1
diff --git a/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java b/tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java
@@ -51,7 +51,7 @@ static void beforeAll() throws IOException {
         System.out.println("Starting MySQL ...");
         process = new ProcessBuilder(
                 "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME,
-                "-e", "MYSQL_PASSWORD=" + PASSWORD, "mysql/mysql-server:8.0").redirectOutput(new File("mysql-stdout.txt"))
+                "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").redirectOutput(new File("mysql-stdout.txt"))
                 .redirectError(new File("mysql-stderr.txt")).start();
 
         // Wait until connection can be established

diff --git a/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt b/tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt
@@ -1 +1 @@
-mysql/mysql-server:8.0
+container-registry.oracle.com/mysql/community-server:8.1
diff --git a/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java b/tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java
@@ -51,7 +51,7 @@ static void beforeAll() throws IOException {
         System.out.println("Starting MySQL ...");
         process = new ProcessBuilder(
                 "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME,
-                "-e", "MYSQL_PASSWORD=" + PASSWORD, "mysql/mysql-server:8.0").redirectOutput(new File("mysql-stdout.txt"))
+                "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").redirectOutput(new File("mysql-stdout.txt"))
                 .redirectError(new File("mysql-stderr.txt")).start();
 
         // Wait until connection can be established

diff --git a/...src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt b/...src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt
@@ -1 +1 @@
-mysql/mysql-server:8.0
+container-registry.oracle.com/mysql/community-server:8.1
diff --git a/...c/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java b/...c/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java
@@ -56,7 +56,7 @@ public void init() throws IOException {
         logger.info("Starting MySQL ...");
         process = new ProcessBuilder(
                 "docker", "run", "--rm", "-p", "3306:3306", "-e", "MYSQL_DATABASE=" + DATABASE, "-e", "MYSQL_USER=" + USERNAME,
-                "-e", "MYSQL_PASSWORD=" + PASSWORD, "mysql/mysql-server:8.0").inheritIO().start();
+                "-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:8.1").inheritIO().start();
 
         waitUntil(() -> {
             openConnection().close();

diff --git a/tests/src/samples/docker/image-pull/required-docker-images.txt b/tests/src/samples/docker/image-pull/required-docker-images.txt
@@ -1 +1 @@
-mysql/mysql-server:8.0
+container-registry.oracle.com/mysql/community-server:8.1
diff --git a/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java b/tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java
@@ -32,7 +32,7 @@ private void runImage(String image, boolean shouldSucceed) throws Exception {
 
     @Test
     void pullAllowedImage() throws Exception {
-        runImage("mysql/mysql-server:8.0", true);
+        runImage("container-registry.oracle.com/mysql/community-server:8.1", true);
     }
 
     @Test

diff --git a/tests/tck-build-logic/src/main/resources/AllowedDockerImages.txt b/tests/tck-build-logic/src/main/resources/AllowedDockerImages.txt
@@ -1,4 +1,4 @@
-mysql/mysql-server:8.0
+container-registry.oracle.com/mysql/community-server:8.1
 mariadb:10.8
 postgres:15-alpine
 opengauss/opengauss:3.1.0