Skip to content

Commit

Permalink
feat: align compose ports
Browse files Browse the repository at this point in the history
  • Loading branch information
jrasm91 committed Oct 4, 2024
1 parent 9edc9d6 commit ed46245
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 24 deletions.
1 change: 0 additions & 1 deletion docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ services:
soft: 1048576
hard: 1048576
ports:
- 3001:3001
- 9230:9230
- 9231:9231
depends_on:
Expand Down
19 changes: 17 additions & 2 deletions docker/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
env_file:
- .env
ports:
- 2283:3001
- 2283:2283
depends_on:
- redis
- database
Expand Down Expand Up @@ -71,7 +71,22 @@ services:
interval: 5m
start_interval: 30s
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

# set IMMICH_METRICS=true in .env to enable metrics
Expand Down
21 changes: 18 additions & 3 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ services:
- /etc/localtime:/etc/localtime:ro
env_file:
- .env
ports:
- 2283:3001
# ports:
# - '2283:2283'
depends_on:
- redis
- database
Expand Down Expand Up @@ -69,7 +69,22 @@ services:
interval: 5m
start_interval: 30s
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

volumes:
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/administration/jobs-workers.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Copy the entire `immich-server` block as a new service and make the following ch
- container_name: immich_server
...
- ports:
- - 2283:3001
- - 2283:2283
+ immich-microservices:
+ container_name: immich_microservices
```
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/administration/reverse-proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ services:
# increase readingTimeouts for the entrypoint used here
traefik.http.routers.immich.entrypoints: websecure
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
Expand Down
11 changes: 1 addition & 10 deletions docs/docs/features/hardware-transcoding.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,7 @@ immich-server:
devices:
- /dev/dri:/dev/dri
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".
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/install/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Information on the current workers can be found [here](/docs/administration/jobs
| Variable | Description | Default |
| :------------ | :------------- | :----------------------------------------: |
| `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

Expand Down
3 changes: 2 additions & 1 deletion e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
- IMMICH_MACHINE_LEARNING_ENABLED=false
- IMMICH_METRICS=true
- IMMICH_ENV=testing
- IMMICH_PORT=2285
volumes:
- ./test-assets:/test-assets
extra_hosts:
Expand All @@ -29,7 +30,7 @@ services:
- redis
- database
ports:
- 2285:3001
- 2285:2285

redis:
image: redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792
Expand Down
2 changes: 1 addition & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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}

VOLUME /usr/src/app/upload
EXPOSE 3001
EXPOSE 2283
ENTRYPOINT ["tini", "--", "/bin/bash"]
CMD ["start.sh"]

Expand Down
2 changes: 1 addition & 1 deletion server/src/repositories/config.repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export class ConfigRepository implements IConfigRepository {
const isProd = environment === ImmichEnvironment.PRODUCTION;

return {
port: Number(process.env.IMMICH_PORT) || 3001,
port: Number(process.env.IMMICH_PORT) || 2283,
environment,
configFile: process.env.IMMICH_CONFIG_FILE,
logLevel: process.env.IMMICH_LOG_LEVEL as LogLevel,
Expand Down
2 changes: 1 addition & 1 deletion server/test/repositories/config.repository.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { DatabaseExtension } from 'src/interfaces/database.interface';
import { Mocked, vitest } from 'vitest';

const envData: EnvData = {
port: 3001,
port: 2283,
environment: ImmichEnvironment.PRODUCTION,

buildMetadata: {},
Expand Down
2 changes: 1 addition & 1 deletion web/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { visualizer } from 'rollup-plugin-visualizer';
import { defineConfig } from 'vite';

const upstream = {
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:3001/',
target: process.env.IMMICH_SERVER_URL || 'http://immich-server:2283/',
secure: true,
changeOrigin: true,
logLevel: 'info',
Expand Down

0 comments on commit ed46245

Please sign in to comment.