Skip to content

Commit

Permalink
Update docker images (#555)
Browse files Browse the repository at this point in the history 
* Update nats docker image

* Update eclipse-mosquitto docker image

* Update mysql-server docker image

* Add missing update for sample test

* Add missing update for hibernate test
  • Loading branch information
@dnestoro
dnestoro authored Nov 5, 2024
1 parent 5fda11b commit 8a3a3d2
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion tests/src/com.mysql/mysql-connector-j/8.0.31/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
container-registry.oracle.com/mysql/community-server:9.0.1
container-registry.oracle.com/mysql/community-server:9.1.0
2 changes: 1 addition & 1 deletion tests/src/com.mysql/mysql-connector-j/8.0.31/src/test/java/mysql/MySQLTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, "container-registry.oracle.com/mysql/community-server:9.0.1").redirectOutput(new File("mysql-stdout.txt"))
"-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:9.1.0").redirectOutput(new File("mysql-stdout.txt"))
.redirectError(new File("mysql-stderr.txt")).start();

// Wait until connection can be established
Expand Down
2 changes: 1 addition & 1 deletion tests/src/io.nats/jnats/2.16.11/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nats:2.10.21
nats:2.10.22
2 changes: 1 addition & 1 deletion tests/src/io.nats/jnats/2.16.11/src/test/java/io_nats/jnats/JnatsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class JnatsTest {
@BeforeAll
public void init() throws IOException {
System.out.println("Starting NATS ...");
process = new ProcessBuilder("docker", "run", "--rm", "-p", "4222:4222", "nats:2.10.21").inheritIO().start();
process = new ProcessBuilder("docker", "run", "--rm", "-p", "4222:4222", "nats:2.10.22").inheritIO().start();

waitUntil(() -> {
openConnection().close();
Expand Down
2 changes: 1 addition & 1 deletion tests/src/mysql/mysql-connector-java/8.0.29/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
container-registry.oracle.com/mysql/community-server:9.0.1
container-registry.oracle.com/mysql/community-server:9.1.0
2 changes: 1 addition & 1 deletion tests/src/mysql/mysql-connector-java/8.0.29/src/test/java/mysql/MySQLTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, "container-registry.oracle.com/mysql/community-server:9.0.1").redirectOutput(new File("mysql-stdout.txt"))
"-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:9.1.0").redirectOutput(new File("mysql-stdout.txt"))
.redirectError(new File("mysql-stderr.txt")).start();

// Wait until connection can be established
Expand Down
2 changes: 1 addition & 1 deletion tests/src/org.eclipse.paho/org.eclipse.paho.client.mqttv3/1.2.5/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eclipse-mosquitto:2.0.18
eclipse-mosquitto:2.0.20
2 changes: 1 addition & 1 deletion ...qttv3/1.2.5/src/test/java/org_eclipse_paho/org_eclipse_paho_client_mqttv3/Mqttv3Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Mqttv3Test {
@BeforeAll
void beforeAll() throws IOException, MqttException {
System.out.println("Starting MQTT broker ...");
process = new ProcessBuilder("docker", "run", "--rm", "-p", "1883:1883", "eclipse-mosquitto:2.0.18", "mosquitto", "-c", "/mosquitto-no-auth.conf")
process = new ProcessBuilder("docker", "run", "--rm", "-p", "1883:1883", "eclipse-mosquitto:2.0.20", "mosquitto", "-c", "/mosquitto-no-auth.conf")
.inheritIO()
.start();

Expand Down
2 changes: 1 addition & 1 deletion tests/src/org.eclipse.paho/org.eclipse.paho.mqttv5.client/1.2.5/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eclipse-mosquitto:2.0.18
eclipse-mosquitto:2.0.20
2 changes: 1 addition & 1 deletion ...1.2.5/src/test/java/org_eclipse_paho/org_eclipse_paho_mqttv5_client/Mqttv5ClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Mqttv5ClientTest {
@BeforeAll
void beforeAll() throws IOException, MqttException {
System.out.println("Starting MQTT broker ...");
process = new ProcessBuilder("docker", "run", "--rm", "-p", "1883:1883", "eclipse-mosquitto:2.0.18", "mosquitto", "-c", "/mosquitto-no-auth.conf")
process = new ProcessBuilder("docker", "run", "--rm", "-p", "1883:1883", "eclipse-mosquitto:2.0.20", "mosquitto", "-c", "/mosquitto-no-auth.conf")
.inheritIO()
.start();

Expand Down
2 changes: 1 addition & 1 deletion ...src/org.hibernate.reactive/hibernate-reactive-core/2.0.0.Final/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
container-registry.oracle.com/mysql/community-server:9.0.1
container-registry.oracle.com/mysql/community-server:9.1.0
2 changes: 1 addition & 1 deletion ...c/test/java/org_hibernate_reactive/hibernate_reactive_core/HibernateReactiveCoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,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, "container-registry.oracle.com/mysql/community-server:9.0.1").inheritIO().start();
"-e", "MYSQL_PASSWORD=" + PASSWORD, "container-registry.oracle.com/mysql/community-server:9.1.0").inheritIO().start();

waitUntil(() -> {
openConnection().close();
Expand Down
2 changes: 1 addition & 1 deletion tests/src/samples/docker/image-pull/required-docker-images.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
container-registry.oracle.com/mysql/community-server:9.0.1
container-registry.oracle.com/mysql/community-server:9.1.0
2 changes: 1 addition & 1 deletion tests/src/samples/docker/image-pull/src/test/java/image/pull/DockerImagePullTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private void runImage(String image, boolean shouldSucceed) throws Exception {

@Test
void pullAllowedImage() throws Exception {
runImage("container-registry.oracle.com/mysql/community-server:9.0.1", true);
runImage("container-registry.oracle.com/mysql/community-server:9.1.0", true);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-eclipse-mosquitto
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM eclipse-mosquitto:2.0.18
FROM eclipse-mosquitto:2.0.20
2 changes: 1 addition & 1 deletion tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-mysql_mysql-server
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM container-registry.oracle.com/mysql/community-server:9.0.1
FROM container-registry.oracle.com/mysql/community-server:9.1.0
2 changes: 1 addition & 1 deletion tests/tck-build-logic/src/main/resources/allowed-docker-images/Dockerfile-nats
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM nats:2.10.21
FROM nats:2.10.22

0 comments on commit 8a3a3d2

Please sign in to comment.