Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 20:25:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(server): default postgres hostname to compose service name (#9118)

Browse Source
This commit is contained in:
Jason Rasmussen 2024-04-27 13:43:45 -04:00 committed by GitHub
parent 1e34b01986
commit 7ea539b753
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/example.env
View File

@ -13,6 +13,5 @@ DB_PASSWORD=postgres
# The values below this line do not need to be changed # The values below this line do not need to be changed
################################################################################### ###################################################################################
DB_HOSTNAME=immich_postgres
DB_USERNAME=postgres DB_USERNAME=postgres
DB_DATABASE_NAME=immich DB_DATABASE_NAME=immich

2
docs/docs/install/environment-variables.md
View File

@ -61,7 +61,7 @@ These environment variables are used by the `docker-compose.yml` file and do **N
| Variable | Description | Default | Services | | Variable | Description | Default | Services |
| :---------------------------------- | :----------------------------------------------------------------------- | :----------: | :-------------------- | | :---------------------------------- | :----------------------------------------------------------------------- | :----------: | :-------------------- |
| `DB_URL` | Database URL | | server, microservices | | `DB_URL` | Database URL | | server, microservices |
| `DB_HOSTNAME` | Database Host | `localhost` | server, microservices | | `DB_HOSTNAME` | Database Host | `database` | server, microservices |
| `DB_PORT` | Database Port | `5432` | server, microservices | | `DB_PORT` | Database Port | `5432` | server, microservices |
| `DB_USERNAME` | Database User | `postgres` | server, microservices | | `DB_USERNAME` | Database User | `postgres` | server, microservices |
| `DB_PASSWORD` | Database Password | `postgres` | server, microservices | | `DB_PASSWORD` | Database Password | `postgres` | server, microservices |

10
server/src/database.config.ts
View File

@ -6,7 +6,7 @@ const url = process.env.DB_URL;
const urlOrParts = url const urlOrParts = url
? { url } ? { url }
: { : {
host: process.env.DB_HOSTNAME || 'localhost', host: process.env.DB_HOSTNAME || 'database',
port: Number.parseInt(process.env.DB_PORT || '5432'), port: Number.parseInt(process.env.DB_PORT || '5432'),
username: process.env.DB_USERNAME || 'postgres', username: process.env.DB_USERNAME || 'postgres',
password: process.env.DB_PASSWORD || 'postgres', password: process.env.DB_PASSWORD || 'postgres',
@ -26,8 +26,12 @@ export const databaseConfig: PostgresConnectionOptions = {
...urlOrParts, ...urlOrParts,
}; };
// this export is used by TypeORM commands in package.json#scripts /**
export const dataSource = new DataSource(databaseConfig); * @deprecated - DO NOT USE THIS
*
* this export is ONLY to be used for TypeORM commands in package.json#scripts
*/
export const dataSource = new DataSource({ ...databaseConfig, host: 'localhost' });
export const vectorExt = export const vectorExt =
process.env.DB_VECTOR_EXTENSION === 'pgvector' ? DatabaseExtension.VECTOR : DatabaseExtension.VECTORS; process.env.DB_VECTOR_EXTENSION === 'pgvector' ? DatabaseExtension.VECTOR : DatabaseExtension.VECTORS;

3
server/src/repositories/album.repository.ts
View File

@ -1,7 +1,6 @@
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm'; import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
import _ from 'lodash'; import _ from 'lodash';
import { dataSource } from 'src/database.config';
import { Chunked, ChunkedArray, DATABASE_PARAMETER_CHUNK_SIZE, DummyValue, GenerateSql } from 'src/decorators'; import { Chunked, ChunkedArray, DATABASE_PARAMETER_CHUNK_SIZE, DummyValue, GenerateSql } from 'src/decorators';
import { AlbumEntity } from 'src/entities/album.entity'; import { AlbumEntity } from 'src/entities/album.entity';
import { AssetEntity } from 'src/entities/asset.entity'; import { AssetEntity } from 'src/entities/asset.entity';
@ -328,7 +327,7 @@ export class AlbumRepository implements IAlbumRepository {
.limit(1); .limit(1);
// Using dataSource, because there is no direct access to albums_assets_assets. // Using dataSource, because there is no direct access to albums_assets_assets.
const albumHasAssets = dataSource const albumHasAssets = this.dataSource
.createQueryBuilder() .createQueryBuilder()
.select('1') .select('1')
.from('albums_assets_assets', 'albums_assets') .from('albums_assets_assets', 'albums_assets')