Merge pull request #23066 from tsegismont/db_images

Declare DB images defaults in parent POM
quarkusio · Jan 21, 2022 · 887aba6 · 887aba6
2 parents 2a743ff + 4fbc6ee
commit 887aba6
Show file tree

Hide file tree

Showing 28 changed files with 19 additions and 48 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -83,6 +83,13 @@
         <opensearch.image>opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
         <opensearch.protocol>http</opensearch.protocol>
 
+        <!-- Database images for JDBC/Reactive/Hibernate tests -->
+        <postgres.image>docker.io/postgres:14.1</postgres.image>
+        <mariadb.image>docker.io/mariadb:10.4</mariadb.image>
+        <db2.image>docker.io/ibmcom/db2:11.5.5.0</db2.image>
+        <mssql.image>mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04</mssql.image>
+        <oracle.image>docker.io/gvenzl/oracle-xe:21.3.0-slim</oracle.image>
+
         <!-- Align various dependencies that are not really part of the bom-->
         <junit4.version>4.13.2</junit4.version>
 

diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml
@@ -14,7 +14,6 @@
 
     <!-- Defaults, to simplify local testing -->
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 

diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml
@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 

diff --git a/extensions/reactive-mssql-client/deployment/pom.xml b/extensions/reactive-mssql-client/deployment/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <reactive-mssql.url>vertx-reactive:sqlserver://localhost:1433</reactive-mssql.url>
-        <mssql.image>mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04</mssql.image>
     </properties>
 
     <dependencies>
@@ -156,7 +155,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mcr.microsoft.com/mssql/server:2019-latest images currently running, not just those we just started.
+                            <!--Stops all mcr.microsoft.com/mssql/server images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -32,7 +32,6 @@
 
     <properties>
         <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -190,7 +189,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those we just started.
+                            <!--Stops all mariadb images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/extensions/reactive-oracle-client/deployment/pom.xml b/extensions/reactive-oracle-client/deployment/pom.xml
@@ -16,8 +16,6 @@
 
     <properties>
         <reactive-oracledb.url>vertx-reactive:oracle:thin:@localhost:1521:XE</reactive-oracledb.url>
-        <!-- See https://hub.docker.com/r/gvenzl/oracle-xe -->
-        <oracle.image>gvenzl/oracle-xe:21.3.0-slim</oracle.image>
     </properties>
 
     <dependencies>

diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml
@@ -15,7 +15,6 @@
     <name>Quarkus - Reactive PostgreSQL Client - Deployment</name>
 
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <reactive-postgres.url>vertx-reactive:postgresql:///hibernate_orm_test</reactive-postgres.url>
     </properties>
 

diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver-legacy-qualifiers/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -231,7 +230,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those 
+                            <!--Stops all mariadb images currently running, not just those
                                 we just started. Useful to stop processes still running from a previously 
                                 failed integration test run -->
                             <allContainers>true</allContainers>

diff --git a/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml b/integration-tests/hibernate-orm-tenancy/connection-resolver/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -231,7 +230,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those 
+                            <!--Stops all mariadb images currently running, not just those
                                 we just started. Useful to stop processes still running from a previously 
                                 failed integration test run -->
                             <allContainers>true</allContainers>

diff --git a/integration-tests/hibernate-orm-tenancy/datasource/pom.xml b/integration-tests/hibernate-orm-tenancy/datasource/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <mariadb.base_url>jdbc:mariadb://localhost:3306</mariadb.base_url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -251,7 +250,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those 
+                            <!--Stops all mariadb images currently running, not just those
                                 we just started. Useful to stop processes still running from a previously 
                                 failed integration test run -->
                             <allContainers>true</allContainers>

diff --git a/integration-tests/hibernate-reactive-db2/pom.xml b/integration-tests/hibernate-reactive-db2/pom.xml
@@ -14,7 +14,6 @@
     <description>Hibernate Reactive related tests running with the DB2 database</description>
 
     <properties>
-        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
         <reactive-db2.url>vertx-reactive:db2://localhost:50000/hreact</reactive-db2.url>
     </properties>
     <dependencies>

diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -208,7 +207,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those we just started.
+                            <!--Stops all mariadb images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/integration-tests/hibernate-reactive-panache-blocking/pom.xml b/integration-tests/hibernate-reactive-panache-blocking/pom.xml
@@ -14,7 +14,6 @@
     <description>To test proper error reporting and safeguards when Panache Reactive is being used in combination with blocking technologies</description>
 
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 

diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml
@@ -17,7 +17,6 @@
         PanacheQuery.project(Class) needs it.
     -->
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 

diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml
@@ -14,7 +14,6 @@
     <description>Hibernate Reactive related tests running with the PostgreSQL database</description>
 
     <properties>
-        <postgres.image>postgres:14.1</postgres.image>
         <postgres.reactive.url>vertx-reactive:postgresql://localhost:5432/hibernate_orm_test</postgres.reactive.url>
     </properties>
 

diff --git a/integration-tests/jpa-db2/pom.xml b/integration-tests/jpa-db2/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <jdbc-db2.url>jdbc:db2://localhost:50000/hreact</jdbc-db2.url>
-        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml
@@ -15,7 +15,6 @@
 
     <properties>
         <mariadb.url>jdbc:mariadb://localhost:3306/hibernate_orm_test</mariadb.url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -197,7 +196,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those we just started.
+                            <!--Stops all mariadb images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/integration-tests/jpa-mssql/pom.xml b/integration-tests/jpa-mssql/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <mssqldb.url>jdbc:sqlserver://localhost:1433;databaseName=tempdb</mssqldb.url>
         <mssqldb.sa-password>ActuallyRequired11Complexity</mssqldb.sa-password>
-        <mssqldb.image>mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04</mssqldb.image>
     </properties>
 
     <dependencies>
@@ -188,7 +187,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>${mssqldb.image}</name>
+                                    <name>${mssql.image}</name>
                                     <alias>quarkus-test-mssqldb</alias>
                                     <run>
                                         <ports>

diff --git a/integration-tests/jpa-oracle/pom.xml b/integration-tests/jpa-oracle/pom.xml
@@ -15,8 +15,6 @@
 
     <properties>
         <oracledb.url>jdbc:oracle:thin:@localhost:1521/XE</oracledb.url>
-        <!-- See https://hub.docker.com/r/gvenzl/oracle-xe -->
-        <oracle.image>gvenzl/oracle-xe:21.3.0-slim</oracle.image>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/jpa-postgresql-withxml/pom.xml b/integration-tests/jpa-postgresql-withxml/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - Integration Tests - JPA - PostgreSQL</name>
     <description>Module that contains JPA related tests running with the PostgreSQL database</description>
 
-    <properties>
-        <postgres.image>postgres:14.1</postgres.image>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml
@@ -13,10 +13,6 @@
     <name>Quarkus - Integration Tests - JPA - PostgreSQL</name>
     <description>Module that contains JPA related tests running with the PostgreSQL database</description>
 
-    <properties>
-        <postgres.image>postgres:14.1</postgres.image>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/integration-tests/kubernetes-service-binding-jdbc/pom.xml b/integration-tests/kubernetes-service-binding-jdbc/pom.xml
@@ -13,10 +13,6 @@
     <artifactId>quarkus-integration-test-k8s-service-binding-jdbc</artifactId>
     <name>Quarkus - Integration Tests - Kubernetes Service Binding JDBC</name>
 
-    <properties>
-        <postgres.image>postgres:14.1</postgres.image>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
@@ -595,7 +595,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>postgres:14.1</name>
+                                    <name>${postgres.image}</name>
                                     <alias>postgresql</alias>
                                     <run>
                                         <env>

diff --git a/integration-tests/reactive-db2-client/pom.xml b/integration-tests/reactive-db2-client/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <reactive-db2.url>vertx-reactive:db2://localhost:50000/hreact</reactive-db2.url>
-        <db2.image>ibmcom/db2:11.5.5.0</db2.image>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/reactive-mssql-client/pom.xml b/integration-tests/reactive-mssql-client/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <reactive-mssql.url>vertx-reactive:sqlserver://localhost:1433</reactive-mssql.url>
-        <mssql.image>mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04</mssql.image>
     </properties>
 
     <dependencies>
@@ -186,7 +185,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mcr.microsoft.com/mssql/server:2019-latest images currently running, not just those we just started.
+                            <!--Stops all mcr.microsoft.com/mssql/server images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/integration-tests/reactive-mysql-client/pom.xml b/integration-tests/reactive-mysql-client/pom.xml
@@ -32,7 +32,6 @@
 
     <properties>
         <reactive-mysql.url>vertx-reactive:mysql://localhost:3306/hibernate_orm_test</reactive-mysql.url>
-        <mariadb.image>mariadb:10.4</mariadb.image>
     </properties>
 
     <dependencies>
@@ -218,7 +217,7 @@
                                     </run>
                                 </image>
                             </images>
-                            <!--Stops all mariadb:10.4 images currently running, not just those we just started.
+                            <!--Stops all mariadb images currently running, not just those we just started.
                               Useful to stop processes still running from a previously failed integration test run -->
                             <allContainers>true</allContainers>
                         </configuration>

diff --git a/integration-tests/reactive-oracle-client/pom.xml b/integration-tests/reactive-oracle-client/pom.xml
@@ -16,7 +16,6 @@
 
     <properties>
         <reactive-oracledb.url>vertx-reactive:oracle:thin:@localhost:1521:XE</reactive-oracledb.url>
-        <oracle.image>gvenzl/oracle-xe:21.3.0-slim</oracle.image>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/reactive-pg-client/pom.xml b/integration-tests/reactive-pg-client/pom.xml
@@ -173,7 +173,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>postgres:14.1</name>
+                                    <name>${postgres.image}</name>
                                     <alias>postgresql</alias>
                                     <run>
                                         <env>