Skip to content

Commit 465f463

Browse files
authored
feat: align compose ports (immich-app#13185)
1 parent b7dcc97 commit 465f463

12 files changed

+44
-23
lines changed

docker/docker-compose.dev.yml

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ services:
4545
soft: 1048576
4646
hard: 1048576
4747
ports:
48-
- 3001:3001
4948
- 9230:9230
5049
- 9231:9231
5150
depends_on:

docker/docker-compose.prod.yml

+17-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
env_file:
1717
- .env
1818
ports:
19-
- 2283:3001
19+
- 2283:2283
2020
depends_on:
2121
- redis
2222
- database
@@ -71,7 +71,22 @@ services:
7171
interval: 5m
7272
start_interval: 30s
7373
start_period: 5m
74-
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"]
74+
command:
75+
[
76+
'postgres',
77+
'-c',
78+
'shared_preload_libraries=vectors.so',
79+
'-c',
80+
'search_path="$$user", public, vectors',
81+
'-c',
82+
'logging_collector=on',
83+
'-c',
84+
'max_wal_size=2GB',
85+
'-c',
86+
'shared_buffers=512MB',
87+
'-c',
88+
'wal_compression=on',
89+
]
7590
restart: always
7691

7792
# set IMMICH_METRICS=true in .env to enable metrics

docker/docker-compose.yml

+17-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
env_file:
2323
- .env
2424
ports:
25-
- 2283:3001
25+
- '2283:2283'
2626
depends_on:
2727
- redis
2828
- database
@@ -69,7 +69,22 @@ services:
6969
interval: 5m
7070
start_interval: 30s
7171
start_period: 5m
72-
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"]
72+
command:
73+
[
74+
'postgres',
75+
'-c',
76+
'shared_preload_libraries=vectors.so',
77+
'-c',
78+
'search_path="$$user", public, vectors',
79+
'-c',
80+
'logging_collector=on',
81+
'-c',
82+
'max_wal_size=2GB',
83+
'-c',
84+
'shared_buffers=512MB',
85+
'-c',
86+
'wal_compression=on',
87+
]
7388
restart: always
7489

7590
volumes:

docs/docs/administration/jobs-workers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Copy the entire `immich-server` block as a new service and make the following ch
2222
- container_name: immich_server
2323
...
2424
- ports:
25-
- - 2283:3001
25+
- - 2283:2283
2626
+ immich-microservices:
2727
+ container_name: immich_microservices
2828
```

docs/docs/administration/reverse-proxy.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ services:
9999
# increase readingTimeouts for the entrypoint used here
100100
traefik.http.routers.immich.entrypoints: websecure
101101
traefik.http.routers.immich.rule: Host(`immich.your-domain.com`)
102-
traefik.http.services.immich.loadbalancer.server.port: 3001
102+
traefik.http.services.immich.loadbalancer.server.port: 2283
103103
```
104104
105105
Keep in mind, that Traefik needs to communicate with the network where immich is in, usually done

docs/docs/features/hardware-transcoding.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,7 @@ immich-server:
8989
devices:
9090
- /dev/dri:/dev/dri
9191
volumes:
92-
- ${UPLOAD_LOCATION}:/usr/src/app/upload
93-
- /etc/localtime:/etc/localtime:ro
94-
env_file:
95-
- .env
96-
ports:
97-
- 2283:3001
98-
depends_on:
99-
- redis
100-
- database
101-
restart: always
92+
...
10293
```
10394

10495
Once this is done, you can continue to step 3 of "Basic Setup".

docs/docs/install/environment-variables.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Information on the current workers can be found [here](/docs/administration/jobs
6868
| Variable | Description | Default |
6969
| :------------ | :------------- | :----------------------------------------: |
7070
| `IMMICH_HOST` | Listening host | `0.0.0.0` |
71-
| `IMMICH_PORT` | Listening port | `3001` (server), `3003` (machine learning) |
71+
| `IMMICH_PORT` | Listening port | `2283` (server), `3003` (machine learning) |
7272

7373
## Database
7474

e2e/docker-compose.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
- IMMICH_MACHINE_LEARNING_ENABLED=false
2222
- IMMICH_METRICS=true
2323
- IMMICH_ENV=testing
24+
- IMMICH_PORT=2285
2425
volumes:
2526
- ./test-assets:/test-assets
2627
extra_hosts:
@@ -29,7 +30,7 @@ services:
2930
- redis
3031
- database
3132
ports:
32-
- 2285:3001
33+
- 2285:2285
3334

3435
redis:
3536
image: redis:6.2-alpine@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5

server/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ENV IMMICH_SOURCE_COMMIT=${BUILD_SOURCE_COMMIT}
7676
ENV IMMICH_SOURCE_URL=https://github.com/immich-app/immich/commit/${BUILD_SOURCE_COMMIT}
7777

7878
VOLUME /usr/src/app/upload
79-
EXPOSE 3001
79+
EXPOSE 2283
8080
ENTRYPOINT ["tini", "--", "/bin/bash"]
8181
CMD ["start.sh"]
8282

server/src/repositories/config.repository.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class ConfigRepository implements IConfigRepository {
5050
};
5151

5252
return {
53-
port: Number(process.env.IMMICH_PORT) || 3001,
53+
port: Number(process.env.IMMICH_PORT) || 2283,
5454
environment,
5555
configFile: process.env.IMMICH_CONFIG_FILE,
5656
logLevel: process.env.IMMICH_LOG_LEVEL as LogLevel,

server/test/repositories/config.repository.mock.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { DatabaseExtension } from 'src/interfaces/database.interface';
44
import { Mocked, vitest } from 'vitest';
55

66
const envData: EnvData = {
7-
port: 3001,
7+
port: 2283,
88
environment: ImmichEnvironment.PRODUCTION,
99

1010
buildMetadata: {},

web/vite.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { visualizer } from 'rollup-plugin-visualizer';
55
import { defineConfig } from 'vite';
66

77
const upstream = {
8-
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:3001/',
8+
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:2283/',
99
secure: true,
1010
changeOrigin: true,
1111
logLevel: 'info',

0 commit comments

Comments
 (0)