mirror of
https://github.com/immich-app/immich.git
synced 2025-06-03 05:34:32 -04:00
feat: align compose ports (#13185)
This commit is contained in:
parent
b7dcc97712
commit
465f4639da
@ -45,7 +45,6 @@ services:
|
|||||||
soft: 1048576
|
soft: 1048576
|
||||||
hard: 1048576
|
hard: 1048576
|
||||||
ports:
|
ports:
|
||||||
- 3001:3001
|
|
||||||
- 9230:9230
|
- 9230:9230
|
||||||
- 9231:9231
|
- 9231:9231
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -16,7 +16,7 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
ports:
|
ports:
|
||||||
- 2283:3001
|
- 2283:2283
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
- database
|
- database
|
||||||
@ -71,7 +71,22 @@ services:
|
|||||||
interval: 5m
|
interval: 5m
|
||||||
start_interval: 30s
|
start_interval: 30s
|
||||||
start_period: 5m
|
start_period: 5m
|
||||||
command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
|
command:
|
||||||
|
[
|
||||||
|
'postgres',
|
||||||
|
'-c',
|
||||||
|
'shared_preload_libraries=vectors.so',
|
||||||
|
'-c',
|
||||||
|
'search_path="$$user", public, vectors',
|
||||||
|
'-c',
|
||||||
|
'logging_collector=on',
|
||||||
|
'-c',
|
||||||
|
'max_wal_size=2GB',
|
||||||
|
'-c',
|
||||||
|
'shared_buffers=512MB',
|
||||||
|
'-c',
|
||||||
|
'wal_compression=on',
|
||||||
|
]
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
# set IMMICH_METRICS=true in .env to enable metrics
|
# set IMMICH_METRICS=true in .env to enable metrics
|
||||||
|
@ -22,7 +22,7 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
ports:
|
ports:
|
||||||
- 2283:3001
|
- '2283:2283'
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
- database
|
- database
|
||||||
@ -69,7 +69,22 @@ services:
|
|||||||
interval: 5m
|
interval: 5m
|
||||||
start_interval: 30s
|
start_interval: 30s
|
||||||
start_period: 5m
|
start_period: 5m
|
||||||
command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
|
command:
|
||||||
|
[
|
||||||
|
'postgres',
|
||||||
|
'-c',
|
||||||
|
'shared_preload_libraries=vectors.so',
|
||||||
|
'-c',
|
||||||
|
'search_path="$$user", public, vectors',
|
||||||
|
'-c',
|
||||||
|
'logging_collector=on',
|
||||||
|
'-c',
|
||||||
|
'max_wal_size=2GB',
|
||||||
|
'-c',
|
||||||
|
'shared_buffers=512MB',
|
||||||
|
'-c',
|
||||||
|
'wal_compression=on',
|
||||||
|
]
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -22,7 +22,7 @@ Copy the entire `immich-server` block as a new service and make the following ch
|
|||||||
- container_name: immich_server
|
- container_name: immich_server
|
||||||
...
|
...
|
||||||
- ports:
|
- ports:
|
||||||
- - 2283:3001
|
- - 2283:2283
|
||||||
+ immich-microservices:
|
+ immich-microservices:
|
||||||
+ container_name: immich_microservices
|
+ container_name: immich_microservices
|
||||||
```
|
```
|
||||||
|
@ -99,7 +99,7 @@ services:
|
|||||||
# increase readingTimeouts for the entrypoint used here
|
# increase readingTimeouts for the entrypoint used here
|
||||||
traefik.http.routers.immich.entrypoints: websecure
|
traefik.http.routers.immich.entrypoints: websecure
|
||||||
traefik.http.routers.immich.rule: Host(`immich.your-domain.com`)
|
traefik.http.routers.immich.rule: Host(`immich.your-domain.com`)
|
||||||
traefik.http.services.immich.loadbalancer.server.port: 3001
|
traefik.http.services.immich.loadbalancer.server.port: 2283
|
||||||
```
|
```
|
||||||
|
|
||||||
Keep in mind, that Traefik needs to communicate with the network where immich is in, usually done
|
Keep in mind, that Traefik needs to communicate with the network where immich is in, usually done
|
||||||
|
@ -89,16 +89,7 @@ immich-server:
|
|||||||
devices:
|
devices:
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
volumes:
|
volumes:
|
||||||
- ${UPLOAD_LOCATION}:/usr/src/app/upload
|
...
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
ports:
|
|
||||||
- 2283:3001
|
|
||||||
depends_on:
|
|
||||||
- redis
|
|
||||||
- database
|
|
||||||
restart: always
|
|
||||||
```
|
```
|
||||||
|
|
||||||
Once this is done, you can continue to step 3 of "Basic Setup".
|
Once this is done, you can continue to step 3 of "Basic Setup".
|
||||||
|
@ -68,7 +68,7 @@ Information on the current workers can be found [here](/docs/administration/jobs
|
|||||||
| Variable | Description | Default |
|
| Variable | Description | Default |
|
||||||
| :------------ | :------------- | :----------------------------------------: |
|
| :------------ | :------------- | :----------------------------------------: |
|
||||||
| `IMMICH_HOST` | Listening host | `0.0.0.0` |
|
| `IMMICH_HOST` | Listening host | `0.0.0.0` |
|
||||||
| `IMMICH_PORT` | Listening port | `3001` (server), `3003` (machine learning) |
|
| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) |
|
||||||
|
|
||||||
## Database
|
## Database
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@ services:
|
|||||||
- IMMICH_MACHINE_LEARNING_ENABLED=false
|
- IMMICH_MACHINE_LEARNING_ENABLED=false
|
||||||
- IMMICH_METRICS=true
|
- IMMICH_METRICS=true
|
||||||
- IMMICH_ENV=testing
|
- IMMICH_ENV=testing
|
||||||
|
- IMMICH_PORT=2285
|
||||||
volumes:
|
volumes:
|
||||||
- ./test-assets:/test-assets
|
- ./test-assets:/test-assets
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
@ -29,7 +30,7 @@ services:
|
|||||||
- redis
|
- redis
|
||||||
- database
|
- database
|
||||||
ports:
|
ports:
|
||||||
- 2285:3001
|
- 2285:2285
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:6.2-alpine@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5
|
image: redis:6.2-alpine@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5
|
||||||
|
@ -76,7 +76,7 @@ ENV IMMICH_SOURCE_COMMIT=${BUILD_SOURCE_COMMIT}
|
|||||||
ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE_COMMIT}
|
ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE_COMMIT}
|
||||||
|
|
||||||
VOLUME /usr/src/app/upload
|
VOLUME /usr/src/app/upload
|
||||||
EXPOSE 3001
|
EXPOSE 2283
|
||||||
ENTRYPOINT ["tini", "--", "/bin/bash"]
|
ENTRYPOINT ["tini", "--", "/bin/bash"]
|
||||||
CMD ["start.sh"]
|
CMD ["start.sh"]
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ export class ConfigRepository implements IConfigRepository {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
port: Number(process.env.IMMICH_PORT) || 3001,
|
port: Number(process.env.IMMICH_PORT) || 2283,
|
||||||
environment,
|
environment,
|
||||||
configFile: process.env.IMMICH_CONFIG_FILE,
|
configFile: process.env.IMMICH_CONFIG_FILE,
|
||||||
logLevel: process.env.IMMICH_LOG_LEVEL as LogLevel,
|
logLevel: process.env.IMMICH_LOG_LEVEL as LogLevel,
|
||||||
|
@ -4,7 +4,7 @@ import { DatabaseExtension } from 'src/interfaces/database.interface';
|
|||||||
import { Mocked, vitest } from 'vitest';
|
import { Mocked, vitest } from 'vitest';
|
||||||
|
|
||||||
const envData: EnvData = {
|
const envData: EnvData = {
|
||||||
port: 3001,
|
port: 2283,
|
||||||
environment: ImmichEnvironment.PRODUCTION,
|
environment: ImmichEnvironment.PRODUCTION,
|
||||||
|
|
||||||
buildMetadata: {},
|
buildMetadata: {},
|
||||||
|
@ -5,7 +5,7 @@ import { visualizer } from 'rollup-plugin-visualizer';
|
|||||||
import { defineConfig } from 'vite';
|
import { defineConfig } from 'vite';
|
||||||
|
|
||||||
const upstream = {
|
const upstream = {
|
||||||
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:3001/',
|
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:2283/',
|
||||||
secure: true,
|
secure: true,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
logLevel: 'info',
|
logLevel: 'info',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user