From e746c257a5ee58dc1a14535983c91b55a421e11a Mon Sep 17 00:00:00 2001 From: "James W. Brinkerhoff" Date: Fri, 6 Nov 2020 07:49:49 -0500 Subject: [PATCH 1/2] Remove hard coded user and dbname from init db migration Signed-off-by: James W. Brinkerhoff --- db/migration/202009171251-init-database.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/db/migration/202009171251-init-database.go b/db/migration/202009171251-init-database.go index c37aa4552..db26c6dac 100644 --- a/db/migration/202009171251-init-database.go +++ b/db/migration/202009171251-init-database.go @@ -6,9 +6,6 @@ func Get202009171251() *migrate.Migration { return &migrate.Migration{ Id: "202009171251-init-database", Up: []string{` -SET ROLE tinkerbell; -SELECT 'CREATE DATABASE tinkerbell' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'tinkerbell'); - CREATE TABLE IF NOT EXISTS hardware ( id UUID UNIQUE , inserted_at TIMESTAMPTZ From 5d2ea7a1bdd954a2b95f26963ba197274492bdbf Mon Sep 17 00:00:00 2001 From: "James W. Brinkerhoff" Date: Fri, 6 Nov 2020 10:17:28 -0500 Subject: [PATCH 2/2] Pass POSTGRES_DB when creating postgres docker container Signed-off-by: James W. Brinkerhoff --- deploy/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 3cd97a4a4..1a9f00b4d 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -63,6 +63,7 @@ services: environment: POSTGRES_PASSWORD: tinkerbell POSTGRES_USER: tinkerbell + POSTGRES_DB: tinkerbell volumes: - postgres_data:/var/lib/postgresql/data:rw ports: