From 2369db9dd6b64aa72ad57595dece9be9b37ab58f Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Mon, 24 Jul 2023 17:12:32 +0200 Subject: [PATCH] Change docker image to the official one from oracle repository --- .../mysql-connector-j/8.0.31/required-docker-images.txt | 2 +- .../8.0.31/src/test/java/mysql/MySQLTests.java | 2 +- .../mysql-connector-java/8.0.29/required-docker-images.txt | 2 +- .../8.0.29/src/test/java/mysql/MySQLTests.java | 2 +- .../2.0.0.Final/required-docker-images.txt | 2 +- .../hibernate_reactive_core/HibernateReactiveCoreTest.java | 2 +- tests/src/samples/docker/image-pull/required-docker-images.txt | 2 +- .../src/test/java/image/pull/DockerImagePullTests.java | 2 +- .../tck-build-logic/src/main/resources/AllowedDockerImages.txt | 2 +- 9 files changed, 9 insertions(+), 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 index 6df4cad6b..a851722df 100644 --- 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 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file 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 index 645c7529f..65729a5e7 100644 --- 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 index 6df4cad6b..a851722df 100644 --- 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 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file 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 index c1be465aa..c496c2466 100644 --- 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/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt index 6df4cad6b..a851722df 100644 --- a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt +++ b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt @@ -1 +1 @@ -mysql/mysql-server:8.0 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file diff --git a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java index dc1f8b311..6f46d9135 100644 --- a/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java +++ b/tests/src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/src/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 index 6df4cad6b..a851722df 100644 --- 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 \ No newline at end of file +container-registry.oracle.com/mysql/community-server:8.1 \ No newline at end of file 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 index a1b1f9fb9..b25a8d954 100644 --- 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 index 161aa841b..f3cceb770 100644 --- 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