[pull] main from immich-app:main

.github/workflows/test.yml

@@ -497,14 +497,15 @@ jobs:
         run: npx playwright install chromium --only-shell
         if: ${{ !cancelled() }}
       - name: Docker build
-        run: docker compose build
+        run: docker compose up -d --build --renew-anon-volumes --force-recreate --remove-orphans --wait --wait-timeout 300
         if: ${{ !cancelled() }}
       - name: Run e2e tests (web)
         env:
           CI: true
-        run: npx playwright test --project=chromium
+          PLAYWRIGHT_DISABLE_WEBSERVER: true
+        run: npx playwright test --project=web
         if: ${{ !cancelled() }}
-      - name: Archive web results
+      - name: Archive e2e test (web) results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: success() || failure()
         with:
@@ -513,14 +514,37 @@ jobs:
       - name: Run ui tests (web)
         env:
           CI: true
+          PLAYWRIGHT_DISABLE_WEBSERVER: true
         run: npx playwright test --project=ui
         if: ${{ !cancelled() }}
-      - name: Archive ui results
+      - name: Archive ui test (web) results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: success() || failure()
         with:
           name: e2e-ui-test-results-${{ matrix.runner }}
           path: e2e/playwright-report/
+      - name: Run maintenance tests
+        env:
+          CI: true
+          PLAYWRIGHT_DISABLE_WEBSERVER: true
+        run: npx playwright test --project=maintenance
+        if: ${{ !cancelled() }}
+      - name: Archive maintenance tests (web) results
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: success() || failure()
+        with:
+          name: e2e-maintenance-isolated-test-results-${{ matrix.runner }}
+          path: e2e/playwright-report/
+      - name: Capture Docker logs
+        if: always()
+        run: docker compose logs --no-color > docker-compose-logs.txt
+        working-directory: ./e2e
+      - name: Archive Docker logs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        if: always()
+        with:
+          name: docker-compose-logs-${{ matrix.runner }}
+          path: e2e/docker-compose-logs.txt
   success-check-e2e:
     name: End-to-End Tests Success
     needs: [e2e-tests-server-cli, e2e-tests-web]

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.9",
+    "@types/node": "^24.10.11",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

docker/docker-compose.rootless.yml

@@ -0,0 +1,100 @@
+#
+# WARNING: To install Immich, follow our guide: https://docs.immich.app/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
+#
+# https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
+#
+# The compose file on main may not be compatible with the latest release.
+
+name: immich
+
+services:
+  immich-server:
+    container_name: immich_server
+    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
+    user: '1000:1000'
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - NET_RAW
+    volumes:
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/data
+      - /etc/localtime:/etc/localtime:ro
+    env_file:
+      - .env
+    ports:
+      - '2283:2283'
+    depends_on:
+      - redis
+      - database
+    restart: always
+    healthcheck:
+      disable: false
+
+  immich-machine-learning:
+    container_name: immich_machine_learning
+    # For hardware acceleration, add one of -[armnn, cuda, rocm, openvino, rknn] to the image tag.
+    # Example tag: ${IMMICH_VERSION:-release}-cuda
+    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
+    # extends: # uncomment this section for hardware acceleration - see https://docs.immich.app/features/ml-hardware-acceleration
+    #   file: hwaccel.ml.yml
+    #   service: cpu # set to one of [armnn, cuda, rocm, openvino, openvino-wsl, rknn] for accelerated inference - use the `-wsl` version for WSL2 where applicable
+    user: '1000:1000'
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - NET_RAW
+    volumes:
+      - ./ml-model-cache:/cache
+      - ./ml-dotcache:/.cache
+      - ./ml-config:/.config
+    env_file:
+      - .env
+    restart: always
+    healthcheck:
+      disable: false
+
+  redis:
+    container_name: immich_redis
+    image: docker.io/valkey/valkey:9@sha256:546304417feac0874c3dd576e0952c6bb8f06bb4093ea0c9ca303c73cf458f63
+    user: '1000:1000'
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - NET_RAW
+    volumes:
+      - ./redis:/data
+    healthcheck:
+      test: redis-cli ping || exit 1
+    restart: always
+
+  database:
+    container_name: immich_postgres
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
+    user: '1000:1000'
+    security_opt:
+      - no-new-privileges:true
+    cap_drop:
+      - NET_RAW
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      POSTGRES_INITDB_ARGS: '--data-checksums'
+      # Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
+      # DB_STORAGE_TYPE: 'HDD'
+    volumes:
+      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
+      - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    shm_size: 128mb
+    restart: always
+    healthcheck:
+      disable: false
+
+volumes:
+  model-cache:

docs/docs/FAQ.mdx

@@ -402,6 +402,9 @@ To decrease Redis logs, you can add the following line to the `redis:` section o
 ### How can I run Immich as a non-root user?
 
 You can change the user in the container by setting the `user` argument in `docker-compose.yml` for each service.
+
+[Example docker-compose.yml file](https://github.com/immich-app/immich/blob/main/docker/docker-compose.rootless.yml)
+
 You may need to add mount points or docker volumes for the following internal container paths:
 
 - `immich-machine-learning:/.config`

docs/docs/features/ml-hardware-acceleration.md

@@ -86,8 +86,8 @@ You do not need to redo any machine learning jobs after enabling hardware accele
 ## Setup
 
 1. If you do not already have it, download the latest [`hwaccel.ml.yml`][hw-file] file and ensure it's in the same folder as the `docker-compose.yml`.
-2. In the `docker-compose.yml` under `immich-machine-learning`, uncomment the `extends` section and change `cpu` to the appropriate backend.
-3. Still in `immich-machine-learning`, add one of -[armnn, cuda, rocm, openvino, rknn] to the `image` section's tag at the end of the line.
+2. In `immich-machine-learning`, add one of -[armnn, cuda, rocm, openvino, rknn] to the `image` section's tag at the end of the line.
+3. Still in the `docker-compose.yml` under `immich-machine-learning`, uncomment the `extends` section and change `cpu` to the appropriate backend.
 4. Redeploy the `immich-machine-learning` container with these updated settings.
 
 ### Confirming Device Usage

docs/static/archived-versions.json

@@ -1,7 +1,7 @@
 [
   {
-    "label": "v2.5.5",
-    "url": "https://docs.v2.5.5.archive.immich.app"
+    "label": "v2.5.6",
+    "url": "https://docs.v2.5.6.archive.immich.app"
   },
   {
     "label": "v2.4.1",

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -27,7 +27,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.9",
+    "@types/node": "^24.10.11",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",

e2e/playwright.config.ts

@@ -14,7 +14,8 @@ export const playwrightDisableWebserver = process.env.PLAYWRIGHT_DISABLE_WEBSERV
 process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';
 
 const config: PlaywrightTestConfig = {
-  testDir: './src/web/specs',
+  testDir: './src/specs/server',
+  testMatch: /.*\.e2e-spec\.ts/,
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 4 : 0,
@@ -28,54 +29,28 @@ const config: PlaywrightTestConfig = {
     },
   },
 
-  testMatch: /.*\.e2e-spec\.ts/,
-
   workers: process.env.CI ? 4 : Math.round(cpus().length * 0.75),
 
   projects: [
     {
-      name: 'chromium',
+      name: 'web',
       use: { ...devices['Desktop Chrome'] },
-      testMatch: /.*\.e2e-spec\.ts/,
+      testDir: './src/specs/web',
       workers: 1,
     },
     {
       name: 'ui',
       use: { ...devices['Desktop Chrome'] },
-      testMatch: /.*\.ui-spec\.ts/,
+      testDir: './src/ui/specs',
       fullyParallel: true,
       workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
     },
-
-    // {
-    //   name: 'firefox',
-    //   use: { ...devices['Desktop Firefox'] },
-    // },
-
-    // {
-    //   name: 'webkit',
-    //   use: { ...devices['Desktop Safari'] },
-    // },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
+    {
+      name: 'maintenance',
+      use: { ...devices['Desktop Chrome'] },
+      testDir: './src/specs/maintenance',
+      workers: 1,
+    },
   ],
 
   /* Run your local dev server before starting the tests */

e2e/src/generators/memory/model-objects.ts → e2e/src/ui/generators/memory/model-objects.ts

@@ -1,9 +1,9 @@
 import { faker } from '@faker-js/faker';
 import { MemoryType, type MemoryResponseDto, type OnThisDayDto } from '@immich/sdk';
 import { DateTime } from 'luxon';
-import { toAssetResponseDto } from 'src/generators/timeline/rest-response';
-import type { MockTimelineAsset } from 'src/generators/timeline/timeline-config';
-import { SeededRandom, selectRandomMultiple } from 'src/generators/timeline/utils';
+import { toAssetResponseDto } from 'src/ui/generators/timeline/rest-response';
+import type { MockTimelineAsset } from 'src/ui/generators/timeline/timeline-config';
+import { SeededRandom, selectRandomMultiple } from 'src/ui/generators/timeline/utils';
 
 export type MemoryConfig = {
   id?: string;

e2e/src/generators/timeline/distribution-patterns.ts → e2e/src/ui/generators/timeline/distribution-patterns.ts

@@ -1,5 +1,5 @@
-import { generateConsecutiveDays, generateDayAssets } from 'src/generators/timeline/model-objects';
-import { SeededRandom, selectRandomDays } from 'src/generators/timeline/utils';
+import { generateConsecutiveDays, generateDayAssets } from 'src/ui/generators/timeline/model-objects';
+import { SeededRandom, selectRandomDays } from 'src/ui/generators/timeline/utils';
 import type { MockTimelineAsset } from './timeline-config';
 import { GENERATION_CONSTANTS } from './timeline-config';
 

e2e/src/generators/timeline/images.ts → e2e/src/ui/generators/timeline/images.ts

@@ -1,5 +1,5 @@
 import sharp from 'sharp';
-import { SeededRandom } from 'src/generators/timeline/utils';
+import { SeededRandom } from 'src/ui/generators/timeline/utils';
 
 export const randomThumbnail = async (seed: string, ratio: number) => {
   const height = 235;

e2e/src/generators/timeline/model-objects.ts → e2e/src/ui/generators/timeline/model-objects.ts

@@ -6,7 +6,7 @@ import { faker } from '@faker-js/faker';
 import { AssetVisibility } from '@immich/sdk';
 import { DateTime } from 'luxon';
 import { writeFileSync } from 'node:fs';
-import { SeededRandom } from 'src/generators/timeline/utils';
+import { SeededRandom } from 'src/ui/generators/timeline/utils';
 import type { DayPattern, MonthDistribution } from './distribution-patterns';
 import { ASSET_DISTRIBUTION, DAY_DISTRIBUTION } from './distribution-patterns';
 import type { MockTimelineAsset, MockTimelineData, SerializedTimelineData, TimelineConfig } from './timeline-config';

e2e/src/generators/timeline/rest-response.ts → e2e/src/ui/generators/timeline/rest-response.ts

@@ -15,7 +15,7 @@ import {
 } from '@immich/sdk';
 import { DateTime } from 'luxon';
 import { signupDto } from 'src/fixtures';
-import { parseTimeBucketKey } from 'src/generators/timeline/utils';
+import { parseTimeBucketKey } from 'src/ui/generators/timeline/utils';
 import type { MockTimelineAsset, MockTimelineData } from './timeline-config';
 
 /**

e2e/src/generators/timeline/timeline-config.ts → e2e/src/ui/generators/timeline/timeline-config.ts

@@ -1,5 +1,5 @@
 import type { AssetVisibility } from '@immich/sdk';
-import { DayPattern, MonthDistribution } from 'src/generators/timeline/distribution-patterns';
+import { DayPattern, MonthDistribution } from 'src/ui/generators/timeline/distribution-patterns';
 
 // Constants for generation parameters
 export const GENERATION_CONSTANTS = {

e2e/src/generators/timeline/utils.ts → e2e/src/ui/generators/timeline/utils.ts

@@ -1,5 +1,5 @@
 import { DateTime } from 'luxon';
-import { GENERATION_CONSTANTS, MockTimelineAsset } from 'src/generators/timeline/timeline-config';
+import { GENERATION_CONSTANTS, MockTimelineAsset } from 'src/ui/generators/timeline/timeline-config';
 
 /**
  * Linear Congruential Generator for deterministic pseudo-random numbers

e2e/src/mock-network/timeline-network.ts → e2e/src/ui/mock-network/timeline-network.ts

@@ -10,8 +10,8 @@ import {
   randomPreview,
   randomThumbnail,
   TimelineData,
-} from 'src/generators/timeline';
-import { sleep } from 'src/web/specs/timeline/utils';
+} from 'src/ui/generators/timeline';
+import { sleep } from 'src/ui/specs/timeline/utils';
 
 export class TimelineTestContext {
   slowBucket = false;

e2e/src/web/specs/asset-viewer/asset-viewer.ui-spec.ts → e2e/src/ui/specs/asset-viewer/asset-viewer.e2e-spec.ts

@@ -8,11 +8,11 @@ import {
   selectRandom,
   TimelineAssetConfig,
   TimelineData,
-} from 'src/generators/timeline';
-import { setupBaseMockApiRoutes } from 'src/mock-network/base-network';
-import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/mock-network/timeline-network';
+} from 'src/ui/generators/timeline';
+import { setupBaseMockApiRoutes } from 'src/ui/mock-network/base-network';
+import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/ui/mock-network/timeline-network';
 import { utils } from 'src/utils';
-import { assetViewerUtils } from 'src/web/specs/timeline/utils';
+import { assetViewerUtils } from '../timeline/utils';
 
 test.describe.configure({ mode: 'parallel' });
 test.describe('asset-viewer', () => {