From ed46245cf2e4e2e4322efe4bca86ce08e134b5a0 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Fri, 4 Oct 2024 09:45:44 -0400 Subject: [PATCH] feat: align compose ports --- docker/docker-compose.dev.yml | 1 - docker/docker-compose.prod.yml | 19 +++++++++++++++-- docker/docker-compose.yml | 21 ++++++++++++++++--- docs/docs/administration/jobs-workers.md | 2 +- docs/docs/administration/reverse-proxy.md | 2 +- docs/docs/features/hardware-transcoding.md | 11 +--------- docs/docs/install/environment-variables.md | 2 +- e2e/docker-compose.yml | 3 ++- server/Dockerfile | 2 +- server/src/repositories/config.repository.ts | 2 +- .../repositories/config.repository.mock.ts | 2 +- web/vite.config.js | 2 +- 12 files changed, 45 insertions(+), 24 deletions(-) diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 066dc9c701b45d..e11d69d0c76a9c 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -45,7 +45,6 @@ services: soft: 1048576 hard: 1048576 ports: - - 3001:3001 - 9230:9230 - 9231:9231 depends_on: diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index a6256b33b1e643..d9df04cd9bf94b 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -16,7 +16,7 @@ services: env_file: - .env ports: - - 2283:3001 + - 2283:2283 depends_on: - redis - database @@ -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 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index eec723dc08dbba..160e782a3563bd 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -21,8 +21,8 @@ services: - /etc/localtime:/etc/localtime:ro env_file: - .env - ports: - - 2283:3001 + # ports: + # - '2283:2283' depends_on: - redis - database @@ -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: diff --git a/docs/docs/administration/jobs-workers.md b/docs/docs/administration/jobs-workers.md index fb5ca7c059165b..fde39a2e3af7c2 100644 --- a/docs/docs/administration/jobs-workers.md +++ b/docs/docs/administration/jobs-workers.md @@ -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 ``` diff --git a/docs/docs/administration/reverse-proxy.md b/docs/docs/administration/reverse-proxy.md index c40fecbdc4c231..c167a10d7fbc5b 100644 --- a/docs/docs/administration/reverse-proxy.md +++ b/docs/docs/administration/reverse-proxy.md @@ -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 diff --git a/docs/docs/features/hardware-transcoding.md b/docs/docs/features/hardware-transcoding.md index deba45caccebc0..66a15f051198e8 100644 --- a/docs/docs/features/hardware-transcoding.md +++ b/docs/docs/features/hardware-transcoding.md @@ -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". diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md index 29549586d359e7..fa9cf26ec7e8eb 100644 --- a/docs/docs/install/environment-variables.md +++ b/docs/docs/install/environment-variables.md @@ -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 diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 6169a4bfa1725d..5cb1bf359cf2be 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -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: @@ -29,7 +30,7 @@ services: - redis - database ports: - - 2285:3001 + - 2285:2285 redis: image: redis:6.2-alpine@sha256:2d1463258f2764328496376f5d965f20c6a67f66ea2b06dc42af351f75248792 diff --git a/server/Dockerfile b/server/Dockerfile index 4ebae191e914df..f7f49d3c153441 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -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"] diff --git a/server/src/repositories/config.repository.ts b/server/src/repositories/config.repository.ts index ed9d80a980b60e..14405a06dca108 100644 --- a/server/src/repositories/config.repository.ts +++ b/server/src/repositories/config.repository.ts @@ -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, diff --git a/server/test/repositories/config.repository.mock.ts b/server/test/repositories/config.repository.mock.ts index 960a7c1e83e25f..d908b7437fe7d9 100644 --- a/server/test/repositories/config.repository.mock.ts +++ b/server/test/repositories/config.repository.mock.ts @@ -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: {}, diff --git a/web/vite.config.js b/web/vite.config.js index 7d15832de4b70a..91acd15bf2f71c 100644 --- a/web/vite.config.js +++ b/web/vite.config.js @@ -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',