configurable database hostname and port via environment variables

JohT · May 20, 2022 · 6d18fb9 · 6d18fb9
1 parent 94a17e8
commit 6d18fb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/postgresql.yml b/.github/workflows/postgresql.yml
@@ -48,4 +48,9 @@ jobs:
 
       - name: Build with Maven, Test with PostgreSql
         working-directory: showcase-quarkus-eventsourcing
-        run: mvn verify -Dquarkus.profile=postgres --file pom.xml --batch-mode
+        run: mvn verify -Dquarkus.profile=postgres --file pom.xml --batch-mode
+        env:
+          # The hostname used to communicate with the PostgreSQL service container
+          POSTGRES_HOST: postgres
+          # The default PostgreSQL port
+          POSTGRES_PORT: 5432
diff --git a/showcase-quarkus-eventsourcing/src/main/resources/application.properties b/showcase-quarkus-eventsourcing/src/main/resources/application.properties
@@ -31,7 +31,7 @@ quarkus.flyway.locations=db/command/common,db/command/h2,db/query/common,db/quer
 
 # H2 in-memory as default database e.g. for flyway
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:eventsourcing;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;DATABASE_TO_UPPER=false
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://${H2_HOST:localhost}/mem:eventsourcing;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;DATABASE_TO_UPPER=false
 quarkus.datasource.username=sa
 quarkus.datasource.password=sa
 quarkus.datasource.jdbc.min-size=2
@@ -40,7 +40,7 @@ quarkus.datasource.jdbc.transactions=xa
 
 # PostgreSql as default database e.g. for flyway (for quarkus.profile=postges)
 %postgres.quarkus.datasource.db-kind=postgresql
-%postgres.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres?stringtype=unspecified
+%postgres.quarkus.datasource.jdbc.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:${POSTGRES_PORT:5432}/postgres?stringtype=unspecified
 %postgres.quarkus.datasource.username=postgres
 %postgres.quarkus.datasource.password=
 %postgres.quarkus.datasource.jdbc.max-size=8
@@ -49,7 +49,7 @@ quarkus.datasource.jdbc.transactions=xa
 
 # H2 in-memory as messaging database 
 quarkus.datasource.messaging.db-kind=h2
-quarkus.datasource.messaging.jdbc.url=jdbc:h2:tcp://localhost/mem:eventsourcing;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;DATABASE_TO_UPPER=false
+quarkus.datasource.messaging.jdbc.url=jdbc:h2:tcp://${H2_HOST:localhost}/mem:eventsourcing;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;DATABASE_TO_UPPER=false
 quarkus.datasource.messaging.username=sa
 quarkus.datasource.messaging.password=sa
 quarkus.datasource.messaging.jdbc.min-size=2
@@ -58,7 +58,7 @@ quarkus.datasource.messaging.jdbc.transactions=xa
 
 # PostgreSql as messaging database (for quarkus.profile=postges)
 %postgres.quarkus.datasource.messaging.db-kind=postgresql
-%postgres.quarkus.datasource.messaging.jdbc.url=jdbc:postgresql://localhost:5432/postgres?stringtype=unspecified
+%postgres.quarkus.datasource.messaging.jdbc.url=jdbc:postgresql://${POSTGRES_HOST:localhost}:${POSTGRES_PORT:5432}/postgres?stringtype=unspecified
 %postgres.quarkus.datasource.messaging.username=postgres
 %postgres.quarkus.datasource.messaging.password=
 %postgres.quarkus.datasource.messaging.jdbc.min-size=2