diff --git a/.version b/.version index 61b813d5e6..5bb76b575e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.25.2 +1.25.3 diff --git a/server/.version b/server/.version index 61b813d5e6..5bb76b575e 100644 --- a/server/.version +++ b/server/.version @@ -1 +1 @@ -1.25.2 +1.25.3 diff --git a/server/scripts/create-database.ts b/server/scripts/create-database.ts index da9ccff033..2336b8abc5 100644 --- a/server/scripts/create-database.ts +++ b/server/scripts/create-database.ts @@ -35,6 +35,11 @@ function createDatabase(): void { } }); + if (envVars.PG_DB_OWNER === 'false') { + console.log('Skipping database creation'); + return; + } + const createdb = `PGPASSWORD=${envVars.PG_PASS} createdb ` + `-h ${envVars.PG_HOST} ` + diff --git a/server/scripts/database-config-utils.ts b/server/scripts/database-config-utils.ts index adc7ebfd18..b68b9cf066 100644 --- a/server/scripts/database-config-utils.ts +++ b/server/scripts/database-config-utils.ts @@ -16,6 +16,7 @@ function buildDatabaseConfig(): any { PG_PASS: process.env.PG_PASS, PG_USER: process.env.PG_USER, PG_DB: process.env.PG_DB, + PG_DB_OWNER: process.env.PG_DB_OWNER, }; } @@ -27,6 +28,7 @@ function validateDatabaseConfig(dbOptions: any): Joi.ValidationResult { PG_PASS: Joi.string().default(''), PG_USER: Joi.string().required(), PG_DB: Joi.string().default('tooljet_db'), + PG_DB_OWNER: Joi.string().default('true'), }) .unknown();