Merge branch 'main' of https://github.com/shefing/immich into albumsF…

…orPerson

Makefile

@@ -2,7 +2,7 @@ dev:
 	docker-compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-new:
-	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
+	docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans || make dev-down
 
 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

docker/docker-compose.yml

@@ -83,10 +83,6 @@ services:
   immich-proxy:
     container_name: immich_proxy
     image: ghcr.io/immich-app/immich-proxy:${IMMICH_VERSION:-release}
-    environment:
-      # Make sure these values get passed through from the env file
-      - IMMICH_SERVER_URL
-      - IMMICH_WEB_URL
     ports:
       - 2283:8080
     depends_on:

docs/docs/developer/open-api.md

@@ -4,7 +4,7 @@ Immich uses the [OpenAPI](https://swagger.io/specification/) standard to generat
 
 ## Generator
 
-OpenAPI is used to generate the client (Typescript, Dart) SDK. `openapi-generator-cli` can be installed [here](https://openapi-generator.tech/docs/installation/). The generated SDK is based on the `immich-openapi-specs.json` file, which is autogenerated by the server when running in development mode. The `immich-openapi-specs.json` file can be modified with `@nestjs/swagger` decorators used or referenced by controller endpoints. See the [NestJS OpenAPI docs](https://docs.nestjs.com/openapi/types-and-parameters) for more info. When you add a new endpoint or modify an existing one, you must run the command below to update the client SDK.
+OpenAPI is used to generate the client (Typescript, Dart) SDK. `openapi-generator-cli` can be installed [here](https://openapi-generator.tech/docs/installation/). The generated SDK is based on the `immich-openapi-specs.json` file, which is autogenerated by the server **when running in development mode**. The `immich-openapi-specs.json` file can be modified with `@nestjs/swagger` decorators used or referenced by controller endpoints. See the [NestJS OpenAPI docs](https://docs.nestjs.com/openapi/types-and-parameters) for more info. When you add a new endpoint or modify an existing one, you must run the server in development mode and run the command below to update the client SDK.
 
 ```bash
 npm run api:generate # Run from the `server/` directory

docs/docs/install/post-install.mdx

@@ -1,5 +1,5 @@
 ---
-sidebar_position: 80
+sidebar_position: 90
 ---
 
 import RegisterAdminUser from '../partials/_register-admin.md';

docs/docs/install/truenas.md

@@ -0,0 +1,192 @@
+---
+sidebar_position: 80
+---
+
+# TrueNAS SCALE [Community]
+
+:::note
+This is a community contribution and not officially supported by the Immich team, but included here for convenience.
+
+**Please report issues to the corresponding [Github Repository](https://github.com/truenas/charts/tree/master/community/immich).**
+:::
+
+Immich can easily be installed on TrueNAS SCALE via the **Community** train application.
+Consider reviewing the TrueNAS [Apps tutorial](https://www.truenas.com/docs/scale/scaletutorials/apps/) if you have not previously configured applications on your system.
+
+TrueNAS SCALE makes installing and updating Immich easy, but you must use the Immich web portal and mobile app to configure accounts and access libraries.
+
+## First Steps
+
+The Immich app in TrueNAS SCALE installs, completes the initial configuration, then starts the Immich web portal.
+When updates become available, SCALE alerts and provides easy updates.
+
+Before installing the Immich app in SCALE, review the [Environment Variables](/docs/install/environment-variables.md) documentation to see if you want to configure any during installation.
+You can configure environment variables at any time after deploying the application.
+
+You can allow SCALE to create the datasets Immich requires automatically during app installation.
+Or before beginning app installation, [create the datasets](https://www.truenas.com/docs/scale/scaletutorials/storage/datasets/datasetsscale/) to use in the **Storage Configuration** section during installation.
+Immich requires seven datasets: **library**, **pgBackup**, **pgData**, **profile**, **thumbs**, **uploads**, and **video**.
+You can organize these as one parent with seven child datasets, for example `mnt/tank/immich/library`, `mnt/tank/immich/pgBackup`, and so on.
+
+## Installing the Immich Application
+
+To install the **Immich** application, go to **Apps**, click **Discover Apps**, either begin typing Immich into the search field or scroll down to locate the **Immich** application widget.
+
+<img
+src={require('./img/truenas01.png').default}
+width="50%"
+alt="Immich App Widget"
+className="border rounded-xl"
+/>
+
+Click on the widget to open the **Immich** application details screen.
+
+<img
+src={require('./img/truenas02.png').default}
+width="100%"
+alt="Immich App Details Screen"
+className="border rounded-xl"
+/>
+
+Click **Install** to open the Immich application configuration screen.
+
+Application configuration settings are presented in several sections, each explained below.
+To find specific fields click in the **Search Input Fields** search field, scroll down to a particular section or click on the section heading on the navigation area in the upper-right corner.
+
+<img
+src={require('./img/truenas03.png').default}
+width="100%"
+alt="Install Immich Screen"
+className="border rounded-xl"
+/>
+
+Accept the default values in **Application Name** and **Version**.
+
+Accept the default value in **Timezone** or change to match your local timezone.
+**Timezone** is only used by the Immich `exiftool` microservice if it cannot be determined from the image metadata.
+
+Accept the default port in **Web Port**.
+
+Immich requires seven storage datasets.
+You can allow SCALE to create them for you, or use the dataset(s) created in [First Steps](#first-steps).
+Select the storage options you want to use for **Immich Uploads Storage**, **Immich Library Storage**, **Immich Thumbs Storage**, **Immich Profile Storage**, **Immich Video Storage**, **Immich Postgres Data Storage**, **Immich Postgres Backup Storage**.
+Select **ixVolume (dataset created automatically by the system)** in **Type** to let SCALE create the dataset or select **Host Path** to use the existing datasets created on the system.
+
+Accept the defaults in Resources or change the CPU and memory limits to suit your use case.
+
+Click **Install**.
+The system opens the **Installed Applications** screen with the Immich app in the **Deploying** state.
+When the installation completes it changes to **Running**.
+
+<img
+src={require('./img/truenas04.png').default}
+width="100%"
+alt="Immich Installed"
+className="border rounded-xl"
+/>
+
+Click **Web Portal** on the **Application Info** widget to open the Immich web interface to set up your account and begin uploading photos.
+
+:::tip
+For more information on how to use the application once installed, please refer to the [Post Install](/docs/install/post-install.mdx) guide.
+:::
+
+## Editing Environment Variables
+
+Go to the **Installed Applications** screen and select Immich from the list of installed applications.
+Click **Edit** on the **Application Info** widget to open the **Edit Immich** screen.
+The settings on the edit screen are the same as on the install screen.
+You cannot edit **Storage Configuration** paths after the initial app install.
+
+Click **Update** to save changes.
+TrueNAS automatically updates, recreates, and redeploys the Immich container with the updated environment variables.
+
+## Updating the App
+
+When updates become available, SCALE alerts and provides easy updates.
+To update the app to the latest version, click **Update** on the **Application Info** widget from the **Installed Applications** screen.
+
+Update opens an update window for the application that includes two selectable options, Images (to be updated) and Changelog. Click on the down arrow to see the options available for each.
+
+Click **Upgrade** to begin the process and open a counter dialog that shows the upgrade progress. When complete, the update badge and buttons disappear and the application Update state on the Installed screen changes from Update Available to Up to date.
+
+## Understanding Immich Settings in TrueNAS SCALE
+
+Accept the default value or enter a name in **Application Name** field.
+In most cases use the default name, but if adding a second deployment of the application you must change this name.
+
+Accept the default version number in **Version**.
+When a new version becomes available, the application has an update badge.
+The **Installed Applications** screen shows the option to update applications.
+
+### Immich Configuration Settings
+
+You can accept the defaults in the **Immich Configuration** settings, or enter the settings you want to use.
+
+<img
+src={require('./img/truenas05.png').default}
+width="100%"
+alt="Configuration Settings"
+className="border rounded-xl"
+/>
+
+Accept the default setting in **Timezone** or change to match your local timezone.
+**Timezone** is only used by the Immich `exiftool` microservice if it cannot be determined from the image metadata.
+
+You can enter a **Public Login Message** to display on the login page, or leave it blank.
+
+### Networking Settings
+
+Accept the default port numbers in **Web Port**.
+The SCALE Immich app listens on port **30041**.
+
+Refer to the TrueNAS [default port list](https://www.truenas.com/docs/references/defaultports/) for a list of assigned port numbers.
+To change the port numbers, enter a number within the range 9000-65535.
+
+<img
+src={require('./img/truenas06.png').default}
+width="100%"
+alt="Networking Settings"
+className="border rounded-xl"
+/>
+
+### Storage Settings
+
+You can install Immich using the default setting **ixVolume (dataset created automatically by the system)** or use the host path option with datasets [created before installing the app](#first-steps).
+
+<img
+src={require('./img/truenas07.png').default}
+width="100%"
+alt="Configure Storage ixVolumes"
+className="border rounded-xl"
+/>
+
+Select **Host Path (Path that already exists on the system)** to browse to and select the datasets.
+
+<img
+src={require('./img/truenas08.png').default}
+width="100%"
+alt="Configure Storage Host Paths"
+className="border rounded-xl"
+/>
+
+### Resource Configuration Settings
+
+Accept the default values in **Resources Configuration** or enter new CPU and memory values
+By default, this application is limited to use no more than 4 CPU cores and 8 Gigabytes available memory. The application might use considerably less system resources.
+
+<img
+src={require('./img/truenas09.png').default}
+width="100%"
+alt="Resource Limits"
+className="border rounded-xl"
+/>
+
+To customize the CPU and memory allocated to the container Immich uses, enter new CPU values as a plain integer value followed by the suffix m (milli).
+Default is 4000m.
+
+Accept the default value 8Gi allocated memory or enter a new limit in bytes.
+Enter a plain integer followed by the measurement suffix, for example 129M or 123Mi.
+
+Systems with compatible GPU(s) display devices in **GPU Configuration**.
+See [Managing GPUs](https://www.truenas.com/docs/scale/scaletutorials/systemsettings/advanced/managegpuscale/) for more information about allocating isolated GPU devices in TrueNAS SCALE.

docs/src/components/timeline.tsx

@@ -10,6 +10,12 @@ export interface Item {
   release: string;
   tag?: string;
   date: Date;
+  dateType: DateType;
+}
+
+export enum DateType {
+  RELEASE = 'Release Date',
+  DATE = 'Date',
 }
 
 interface Props {
@@ -50,7 +56,7 @@ export default function Timeline({ items }: Props): JSX.Element {
             <div className="z-10 flex items-center bg-immich-primary dark:bg-immich-dark-primary border-2 border-solid rounded-full dark:text-black text-white relative top-[50%] left-[-3px] translate-y-[-50%] translate-x-[-50%] w-8 h-8 shadow-lg ">
               <Icon path={mdiCheckboxMarkedCircleOutline} size={1.25} />
             </div>
-            <section className=" dark:bg-immich-dark-gray bg-immich-gray dark:border-0 border-gray-200 border border-solid rounded-2xl flex flex-col w-full gap-2 p-4 ml-4 my-2 hover:bg-immich-primary/10 dark:hover:bg-immich-dark-primary/10 transition-all">
+            <section className=" dark:bg-immich-dark-gray bg-immich-gray dark:border-0 border-gray-200 border border-solid rounded-2xl flex flex-col w-full gap-2 p-4 md:ml-4 my-2 hover:bg-immich-primary/10 dark:hover:bg-immich-dark-primary/10 transition-all">
               <div className="m-0 text-lg flex w-full items-center justify-between gap-2">
                 <p className="m-0 items-start flex gap-2">
                   <Icon path={item.icon} size={1} />
@@ -67,14 +73,12 @@ export default function Timeline({ items }: Props): JSX.Element {
                       [{item.release}]{' '}
                     </a>
                   ) : (
-                    <span>
-                      [{item.release} {isBrowser ? item.date.toLocaleDateString(navigator.language) : ''}]
-                    </span>
+                    <span>[{item.release}]</span>
                   )}
                 </span>
               </div>
               <div className="md:hidden text-xs">
-                Release Date - {isBrowser ? item.date.toLocaleDateString(navigator.language) : ''}
+                {`${item.dateType} - ${isBrowser ? item.date.toLocaleDateString(navigator.language) : ''}`}
               </div>
               <p className="m-0 text-sm text-gray-600 dark:text-gray-300">{item.description}</p>
             </section>