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

feat(cli): set custom postgres port in config.json (#918)

Browse source 
* feat(cli): set custom postgres port in config.json

* fix(cli): small misspelling error.

* fix(cli): misspelling error again

Co-authored-by: Nicolas Meienberger <47644445+meienberger@users.noreply.github.com>

* fix(cli): add required env vard to schemas.

* fix(cli): add default port to schema

* fix(cli): add requested changes

* fix(cli): move posgresPort to pick

---------

Co-authored-by: Nicolas Meienberger <47644445+meienberger@users.noreply.github.com>
This commit is contained in:
Stavros 2023-11-15 22:16:10 +02:00 committed by GitHub
parent ff6c90849e
commit 09461527ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/assets/docker-compose.yml
View file

@ -22,7 +22,7 @@ services:
restart: on-failure
stop_grace_period: 1m
ports:
- 5432:5432
- ${POSTGRES_PORT-5432}:5432
volumes:
- ./data/postgres:/var/lib/postgresql/data
environment:

2
packages/cli/src/executors/system/system.helpers.ts
View file

@ -175,7 +175,7 @@ export const generateSystemEnvFile = async () => {
envMap.set('POSTGRES_DBNAME', 'tipi');
envMap.set('POSTGRES_USERNAME', 'tipi');
envMap.set('POSTGRES_PASSWORD', postgresPassword);
envMap.set('POSTGRES_PORT', String(5432));
envMap.set('POSTGRES_PORT', String(data.postgresPort || 5432));
envMap.set('REDIS_HOST', 'tipi-redis');
envMap.set('REDIS_PASSWORD', redisPassword);
envMap.set('DEMO_MODE', String(data.demoMode || 'false'));

2
packages/shared/src/schemas/env-schemas.ts
View file

@ -63,5 +63,5 @@ export const envSchema = z.object({
export const settingsSchema = envSchema
.partial()
.pick({ dnsIp: true, internalIp: true, appsRepoUrl: true, domain: true, storagePath: true, localDomain: true, demoMode: true, guestDashboard: true })
.pick({ dnsIp: true, internalIp: true, postgresPort: true, appsRepoUrl: true, domain: true, storagePath: true, localDomain: true, demoMode: true, guestDashboard: true })
.and(z.object({ port: z.number(), sslPort: z.number(), listenIp: z.string().ip().trim() }).partial());