0ct0pu5/runtipi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(config): always use internal port 5432 for postgres in non-test mode

Browse source
This commit is contained in:
Nicolas Meienberger 2023-11-19 17:35:53 +01:00
parent 3dd7ef7cdd
commit ef541f1d77
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/(dashboard)/app-store/[id]/components/InstallForm/InstallForm.tsx
View file

@ -175,7 +175,7 @@ export const InstallForm: React.FC<IProps> = ({ formFields, info, onSubmit, init
{initalValues ? t('submit-update') : t('sumbit-install')}
</Button>
{initalValues && onReset && (
<Button loading={status === 'resetting'} onClick={onClickReset} className="btn-danger ms-2">
<Button loading={status === 'stopping'} onClick={onClickReset} className="btn-danger ms-2">
{t('reset')}
</Button>
)}

13
src/server/core/TipiConfig/TipiConfig.ts
View file

@ -29,12 +29,12 @@ export class TipiConfig {
const envMap = envStringToMap(envFile.toString());
const conf = { ...process.env, ...Object.fromEntries(envMap), ...nextConfig().serverRuntimeConfig };
const envConfig: z.infer<typeof envSchema> = {
const envConfig: z.input<typeof envSchema> = {
postgresHost: conf.POSTGRES_HOST,
postgresDatabase: conf.POSTGRES_DBNAME,
postgresUsername: conf.POSTGRES_USERNAME,
postgresPassword: conf.POSTGRES_PASSWORD,
postgresPort: Number(conf.POSTGRES_PORT || 5432),
postgresPort: Number(conf.POSTGRES_PORT),
REDIS_HOST: conf.REDIS_HOST,
redisPassword: conf.REDIS_PASSWORD,
NODE_ENV: conf.NODE_ENV,
@ -84,7 +84,14 @@ export class TipiConfig {
}
public getConfig() {
return { ...this.config, ...this.getFileConfig() };
let conf = { ...this.config, ...this.getFileConfig() };
// If we are not in test mode, we need to set the postgres port to 5432 (internal port)
if (conf.NODE_ENV !== 'test') {
conf = { ...conf, postgresPort: 5432 };
}
return conf;
}
public getSettings() {

2
src/server/run-migrations-dev.ts
View file

@ -17,7 +17,7 @@ export const runPostgresMigrations = async (dbName?: string) => {
host: postgresHost,
database: dbName || postgresDatabase,
password: postgresPassword,
port: Number(postgresPort),
port: Number(process.env.POSTGRES_PORT),
});
await client.connect();