Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BED-4384: Bump Postgres to 16 in development #887

Merged
merged 8 commits into from
Oct 4, 2024
20 changes: 19 additions & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,15 @@ services:
- /var/run/docker.sock:/var/run/docker.sock:ro

app-db:
image: docker.io/library/postgres:13.2
profiles:
- dev
- api-only
- ui-only
- debug-api
- pg-only
image: docker.io/library/postgres:16
ALCooper12 marked this conversation as resolved.
Show resolved Hide resolved
environment:
- PGUSER=${BH_POSTGRES_USER:-bloodhound}
- POSTGRES_USER=${BH_POSTGRES_USER:-bloodhound}
- POSTGRES_PASSWORD=${BH_POSTGRES_PASSWORD:-bloodhoundcommunityedition}
- POSTGRES_DB=${BH_POSTGRES_DB:-bloodhound}
Expand All @@ -49,6 +56,12 @@ services:
start_period: 30s

pgadmin:
profiles:
- dev
- api-only
- ui-only
- debug-api
- pg-only
build:
context: tools/docker-compose
dockerfile: pgadmin.Dockerfile
Expand All @@ -68,6 +81,11 @@ services:
condition: service_healthy

graph-db:
profiles:
- dev
- api-only
- ui-only
- debug-api
build:
args:
memconfig: true
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
services:
testdb:
restart: unless-stopped
image: docker.io/library/postgres:13.2
image: docker.io/library/postgres:16
command: "-c log_statement=all"
environment:
- POSTGRES_USER=bloodhound
Expand Down
3 changes: 2 additions & 1 deletion examples/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@

services:
app-db:
image: docker.io/library/postgres:13.2
image: docker.io/library/postgres:16
environment:
- PGUSER=${POSTGRES_USER:-bloodhound}
- POSTGRES_USER=${POSTGRES_USER:-bloodhound}
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-bloodhoundcommunityedition}
- POSTGRES_DB=${POSTGRES_DB:-bloodhound}
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ appdb:
appName: postgres
container:
name: postgres
image: docker.io/library/postgres:13.2
image: docker.io/library/postgres:16
env:
POSTGRES_USER: "bloodhound"
POSTGRES_PASSWORD: "bloodhoundcommunityedition"
Expand Down
4 changes: 4 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ bh-api-only *ARGS='up':
bh-ui-only *ARGS='up':
@docker compose --profile ui-only -f docker-compose.dev.yml {{ARGS}}

# run docker compose commands for the pg-only profile (Default: up)
pg-only *ARGS='up':
@docker compose --profile pg-only -f docker-compose.dev.yml {{ARGS}}

# run docker compose commands for the BH testing databases (Default: up)
bh-testing *ARGS='up -d':
@docker compose --project-name bh-testing -f docker-compose.testing.yml {{ARGS}}
Expand Down
Loading