Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Start a database which will be used by `tackle-controls`:
docker run -d -p 5432:5432 \
-e POSTGRES_USER=username \
-e POSTGRES_PASSWORD=password \
-e POSTGRES_DB=controls_db \
-e POSTGRES_DB=db \
postgres:13.1
```

Expand All @@ -76,8 +76,8 @@ Move your terminal to where you cloned `tackle-controls` and then:
-Dquarkus.http.port=8080 \
-Dquarkus.datasource.username=username \
-Dquarkus.datasource.password=password \
-Dquarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/controls_db \
-Dquarkus.oidc.client-id=controls-api \
-Dquarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/db \
-Dquarkus.oidc.client-id=tackle-api \
-Dquarkus.oidc.credentials.secret=secret \
-Dquarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/konveyor
```
Expand Down
24 changes: 12 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ services:
ports:
- 5433:5432
environment:
POSTGRES_DB: controls_db
POSTGRES_DB: db
POSTGRES_USER: user
POSTGRES_PASSWORD: password
healthcheck:
test: ["CMD-SHELL", "pg_isready -U user -d controls_db"]
test: ["CMD-SHELL", "pg_isready -U user -d db"]
interval: 10s
timeout: 5s
retries: 5
Expand All @@ -40,9 +40,9 @@ services:
QUARKUS_HTTP_PORT: 8080
QUARKUS_DATASOURCE_USERNAME: user
QUARKUS_DATASOURCE_PASSWORD: password
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://controls-db:5432/controls_db
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://controls-db:5432/db
QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/auth/realms/konveyor
QUARKUS_OIDC_CLIENT_ID: controls-api
QUARKUS_OIDC_CLIENT_ID: tackle-api
QUARKUS_OIDC_CREDENTIALS_SECRET: secret
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/controls/q/health"]
Expand All @@ -60,11 +60,11 @@ services:
ports:
- 5434:5432
environment:
POSTGRES_DB: application_inventory_db
POSTGRES_DB: db
POSTGRES_USER: user
POSTGRES_PASSWORD: password
healthcheck:
test: ["CMD-SHELL", "pg_isready -U user -d application_inventory_db"]
test: ["CMD-SHELL", "pg_isready -U user -d db"]
interval: 10s
timeout: 5s
retries: 5
Expand All @@ -77,9 +77,9 @@ services:
QUARKUS_HTTP_PORT: 8080
QUARKUS_DATASOURCE_USERNAME: user
QUARKUS_DATASOURCE_PASSWORD: password
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://application-inventory-db:5432/application_inventory_db
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://application-inventory-db:5432/db
QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/auth/realms/konveyor
QUARKUS_OIDC_CLIENT_ID: application-inventory-api
QUARKUS_OIDC_CLIENT_ID: tackle-api
QUARKUS_OIDC_CREDENTIALS_SECRET: secret
IO_TACKLE_APPLICATIONINVENTORY_SERVICES_CONTROLS_SERVICE: controls:8080
healthcheck:
Expand All @@ -104,11 +104,11 @@ services:
ports:
- 5435:5432
environment:
POSTGRES_DB: pathfinder_db
POSTGRES_DB: db
POSTGRES_USER: user
POSTGRES_PASSWORD: password
healthcheck:
test: ["CMD-SHELL", "pg_isready -U user -d pathfinder_db"]
test: ["CMD-SHELL", "pg_isready -U user -d db"]
interval: 10s
timeout: 5s
retries: 5
Expand All @@ -121,9 +121,9 @@ services:
QUARKUS_HTTP_PORT: 8080
QUARKUS_DATASOURCE_USERNAME: user
QUARKUS_DATASOURCE_PASSWORD: password
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://pathfinder-db:5432/pathfinder_db
QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://pathfinder-db:5432/db
QUARKUS_OIDC_AUTH_SERVER_URL: http://keycloak:8080/auth/realms/konveyor
QUARKUS_OIDC_CLIENT_ID: pathfinder-api
QUARKUS_OIDC_CLIENT_ID: tackle-api
QUARKUS_OIDC_CREDENTIALS_SECRET: secret
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/pathfinder/q/health"]
Expand Down
Loading