From bdf91c7b886b8b2e0a41a7b8c7c12f6d7a2c8c83 Mon Sep 17 00:00:00 2001
From: Rob Stradling <rob@sectigo.com>
Date: Mon, 18 Nov 2024 12:47:16 +0000
Subject: [PATCH 1/3] Correct hostname and 'root' user in PostgreSQL deployment
example
---
examples/deployment/postgresql/docker-compose.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/deployment/postgresql/docker-compose.yml b/examples/deployment/postgresql/docker-compose.yml
index 53b84a8802..f86398a3c4 100644
--- a/examples/deployment/postgresql/docker-compose.yml
+++ b/examples/deployment/postgresql/docker-compose.yml
@@ -19,7 +19,7 @@ services:
command: [
"--quota_system=postgresql",
"--storage_system=postgresql",
- "--postgresql_uri=postgresql:///defaultdb?host=localhost&user=test&password=zaphod",
+ "--postgresql_uri=postgresql:///defaultdb?host=postgresql&user=postgres",
"--rpc_endpoint=0.0.0.0:8090",
"--http_endpoint=0.0.0.0:8091",
"--alsologtostderr",
@@ -39,7 +39,7 @@ services:
command: [
"--quota_system=postgresql",
"--storage_system=postgresql",
- "--postgresql_uri=postgresql:///defaultdb?host=localhost&user=test&password=zaphod",
+ "--postgresql_uri=postgresql:///defaultdb?host=postgresql&user=postgres",
"--rpc_endpoint=0.0.0.0:8090",
"--http_endpoint=0.0.0.0:8091",
"--force_master",
From 67c380b31133d7634d71292ef3a1d3e82e610de1 Mon Sep 17 00:00:00 2001
From: Rob Stradling <rob@sectigo.com>
Date: Mon, 18 Nov 2024 12:56:43 +0000
Subject: [PATCH 2/3] Can't connect to 'defaultdb' because it doesn't exist yet
---
examples/deployment/postgresql/docker-compose.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/deployment/postgresql/docker-compose.yml b/examples/deployment/postgresql/docker-compose.yml
index f86398a3c4..11b41e6689 100644
--- a/examples/deployment/postgresql/docker-compose.yml
+++ b/examples/deployment/postgresql/docker-compose.yml
@@ -19,7 +19,7 @@ services:
command: [
"--quota_system=postgresql",
"--storage_system=postgresql",
- "--postgresql_uri=postgresql:///defaultdb?host=postgresql&user=postgres",
+ "--postgresql_uri=postgresql:///?host=postgresql&user=postgres",
"--rpc_endpoint=0.0.0.0:8090",
"--http_endpoint=0.0.0.0:8091",
"--alsologtostderr",
@@ -39,7 +39,7 @@ services:
command: [
"--quota_system=postgresql",
"--storage_system=postgresql",
- "--postgresql_uri=postgresql:///defaultdb?host=postgresql&user=postgres",
+ "--postgresql_uri=postgresql:///?host=postgresql&user=postgres",
"--rpc_endpoint=0.0.0.0:8090",
"--http_endpoint=0.0.0.0:8091",
"--force_master",
From 8e8b752b93f2cd33d555fee19e94dc25d3760c77 Mon Sep 17 00:00:00 2001
From: Rob Stradling <rob@sectigo.com>
Date: Mon, 18 Nov 2024 13:05:48 +0000
Subject: [PATCH 3/3] Remove unneeded environment variables
---
examples/deployment/postgresql/docker-compose.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/examples/deployment/postgresql/docker-compose.yml b/examples/deployment/postgresql/docker-compose.yml
index 11b41e6689..46be740df8 100644
--- a/examples/deployment/postgresql/docker-compose.yml
+++ b/examples/deployment/postgresql/docker-compose.yml
@@ -6,9 +6,6 @@ services:
dockerfile: examples/deployment/docker/db_server/postgresql/Dockerfile
environment:
- POSTGRES_HOST_AUTH_METHOD=trust
- - POSTGRESQL_DATABASE=defaultdb
- - POSTGRESQL_USER=test
- - POSTGRESQL_PASSWORD=zaphod
restart: always # keep the PostgreSQL server running
trillian-log-server:
build: