|
14 | 14 | <description>Hibernate Reactive related tests running with the Oracle database</description>
|
15 | 15 |
|
16 | 16 | <properties>
|
17 |
| - <reactive-oracle.url>vertx-reactive:oracle:thin:@localhost:1520/hibernate_orm_test</reactive-oracle.url> |
| 17 | + <reactive-oracle.url>vertx-reactive:oracle:thin:@localhost:1521/FREEPDB1</reactive-oracle.url> |
18 | 18 | </properties>
|
19 | 19 |
|
20 | 20 | <dependencies>
|
|
186 | 186 | <images>
|
187 | 187 | <image>
|
188 | 188 | <name>${oracle.image}</name>
|
189 |
| - <alias>oracle</alias> |
190 | 189 | <run>
|
| 190 | + <ports> |
| 191 | + <port>1521:1521</port> |
| 192 | + </ports> |
191 | 193 | <env>
|
192 |
| - <ORACLE_DATABASE>hibernate_orm_test</ORACLE_DATABASE> |
193 | 194 | <ORACLE_PASSWORD>hibernate_orm_test</ORACLE_PASSWORD>
|
194 |
| - <APP_USER>hibernate_orm_test</APP_USER> |
195 |
| - <APP_USER_PASSWORD>hibernate_orm_test</APP_USER_PASSWORD> |
196 | 195 | </env>
|
197 |
| - <ports> |
198 |
| - <port>1520:1521</port> |
199 |
| - </ports> |
200 | 196 | <log>
|
201 |
| - <prefix>ORACLE:</prefix> |
| 197 | + <prefix>Oracle Database: </prefix> |
202 | 198 | <date>default</date>
|
203 |
| - <color>cyan</color> |
| 199 | + <color>red</color> |
204 | 200 | </log>
|
| 201 | + <wait> |
| 202 | + <!-- good docs found at: https://dmp.fabric8.io/#build-healthcheck --> |
| 203 | + <!-- Unfortunately booting this is slow, needs to set a generous timeout: --> |
| 204 | + <time>60000</time> |
| 205 | + <!-- leverage the healthcheck in the image we use --> |
| 206 | + <healthy>yes</healthy> |
| 207 | + <!-- In case of any issues with the built-in healthcheck we can revert back to the original log check:--> |
| 208 | + <!--<log>DATABASE IS READY TO USE!</log>--> |
| 209 | + </wait> |
205 | 210 | </run>
|
206 | 211 | </image>
|
207 | 212 | </images>
|
208 |
| - <!--Stops all Oracle images currently running, not just those we just started. |
| 213 | + <!--Stops all Oracle DB images currently running, not just those we just started. |
209 | 214 | Useful to stop processes still running from a previously failed integration test run -->
|
210 | 215 | <allContainers>true</allContainers>
|
211 | 216 | </configuration>
|
212 | 217 | <executions>
|
213 | 218 | <execution>
|
214 | 219 | <id>docker-start</id>
|
215 |
| - <phase>pre-integration-test</phase> |
| 220 | + <phase>compile</phase> |
216 | 221 | <goals>
|
217 | 222 | <goal>stop</goal>
|
218 |
| - <goal>build</goal> |
219 | 223 | <goal>start</goal>
|
220 | 224 | </goals>
|
221 | 225 | </execution>
|
|
247 | 251 | </plugins>
|
248 | 252 | </build>
|
249 | 253 | </profile>
|
| 254 | + |
| 255 | + <!-- In general, we want to avoid os- or arch-based guards on tests, but the Oracle |
| 256 | + db would not start on M1 - see https://stackoverflow.com/questions/68605011/oracle-12c-docker-setup-on-apple-m1 --> |
| 257 | + <profile> |
| 258 | + <id>mac-m1</id> |
| 259 | + <activation> |
| 260 | + <os> |
| 261 | + <arch>aarch64</arch> |
| 262 | + </os> |
| 263 | + </activation> |
| 264 | + <build> |
| 265 | + <plugins> |
| 266 | + <plugin> |
| 267 | + <artifactId>maven-surefire-plugin</artifactId> |
| 268 | + <configuration> |
| 269 | + <skip>true</skip> |
| 270 | + </configuration> |
| 271 | + </plugin> |
| 272 | + <plugin> |
| 273 | + <groupId>io.fabric8</groupId> |
| 274 | + <artifactId>docker-maven-plugin</artifactId> |
| 275 | + <configuration> |
| 276 | + <images> |
| 277 | + <image> |
| 278 | + <name>${oracle.image}</name> |
| 279 | + <run> |
| 280 | + <skip>true</skip> |
| 281 | + </run> |
| 282 | + </image> |
| 283 | + </images> |
| 284 | + </configuration> |
| 285 | + </plugin> |
| 286 | + </plugins> |
| 287 | + </build> |
| 288 | + </profile> |
| 289 | + <!-- Disabled pending fix of #33094 --> |
| 290 | + <profile> |
| 291 | + <id>podman</id> |
| 292 | + <activation> |
| 293 | + <property> |
| 294 | + <name>env.IS_PODMAN</name> |
| 295 | + <value>true</value> |
| 296 | + </property> |
| 297 | + </activation> |
| 298 | + <build> |
| 299 | + <plugins> |
| 300 | + <plugin> |
| 301 | + <artifactId>maven-surefire-plugin</artifactId> |
| 302 | + <configuration> |
| 303 | + <skip>true</skip> |
| 304 | + </configuration> |
| 305 | + </plugin> |
| 306 | + </plugins> |
| 307 | + </build> |
| 308 | + </profile> |
250 | 309 | </profiles>
|
251 | 310 |
|
252 | 311 |
|
|
0 commit comments