Skip to content

Commit

Permalink
update postgres docker: more tx locks, v 16.8
Browse files Browse the repository at this point in the history
  • Loading branch information
jchappelow committed Feb 24, 2025
1 parent 38f5803 commit f506d6a
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

services:
postgres:
image: kwildb/postgres:16.5-1
image: kwildb/postgres:16.8-1
env:
POSTGRES_HOST_AUTH_METHOD: trust
options: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

services:
postgres:
image: kwildb/postgres:16.5-1
image: kwildb/postgres:16.8-1
env:
POSTGRES_PORT: 5432
POSTGRES_HOST_AUTH_METHOD: trust
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ easiest is to run our pre-configured Docker image:

```shell
docker run -p 5432:5432 -v kwil-pg-demo:/var/lib/postgresql/data \
--shm-size 256m -e "POSTGRES_HOST_AUTH_METHOD=trust" \
--shm-size 512m -e "POSTGRES_HOST_AUTH_METHOD=trust" \
--name kwil-pg-demo kwildb/postgres:latest
```

Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ tasks:
- |
docker run -p :5432 -v {{ .NAME }}:/var/lib/postgresql/data \
--shm-size 512m -e "POSTGRES_HOST_AUTH_METHOD=trust" \
--name {{ .NAME }} kwildb/postgres:16.5-1
--name {{ .NAME }} kwildb/postgres:16.8-1
pg:clean:
desc: Wipe data from the pg task
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/compose/kwil/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ volumes:
services:
pg:
container_name: postgres-kwild-single
image: kwildb/postgres:16.5-1
image: kwildb/postgres:16.8-1
ports:
- "15432:5432"
restart: always
Expand Down
3 changes: 2 additions & 1 deletion contrib/docker/compose/postgres/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
services:
pg:
container_name: postgres
image: kwildb/postgres:16.5-1
image: kwildb/postgres:16.8-1
ports:
- "5432:5432"
shm_size: "512m"
restart: always
environment:
POSTGRES_HOST_AUTH_METHOD: trust
Expand Down
4 changes: 2 additions & 2 deletions contrib/docker/postgres.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:16.6
FROM postgres:16.8

# Inject the init script that makes the kwild superuser and a kwild database
# owned by that kwild user, as well as a kwil_test_db database for tests.
Expand All @@ -15,4 +15,4 @@ COPY ./pginit.sql /docker-entrypoint-initdb.d/init.sql
# Override the default entrypoint/command to include the additional configuration
CMD ["postgres", "-c", "wal_level=logical", "-c", "max_wal_senders=10", "-c", "max_replication_slots=10", \
"-c", "track_commit_timestamp=true", "-c", "wal_sender_timeout=0", "-c", "max_prepared_transactions=2", \
"-c", "max_locks_per_transaction=256", "-c", "max_connections=128"]
"-c", "max_locks_per_transaction=4096", "-c", "max_connections=128"]
2 changes: 1 addition & 1 deletion test/setup/node-compose.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
retries: 10

{{ .PGServicePrefix }}{{ .NodeNumber }}:
image: kwildb/postgres:16.5-1
image: kwildb/postgres:16.8-1
ports:
- "5432"
restart: always
Expand Down
2 changes: 1 addition & 1 deletion testing/testing.go
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ const ContainerName = "kwil-testing-postgres"
// dockerStartArgs returns the docker start command args
func dockerStartArgs(port string) (args []string) {
return []string{"run", "-d", "-p", port + ":5432", "--name", ContainerName,
"-e", "POSTGRES_HOST_AUTH_METHOD=trust", "kwildb/postgres:16.5-1"}
"-e", "POSTGRES_HOST_AUTH_METHOD=trust", "kwildb/postgres:16.8-1"}
}

// connectWithRetry tries to connect to Postgres, and will retry n times at
Expand Down

0 comments on commit f506d6a

Please sign in to comment.