Match existing env variable

This commit is contained in:
Alan Grainger
2026-10-07 16:01:54 +13:00
parent 19691ccf99
commit 940523a7c0
6 changed files with 18 additions and 14 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ services:
# - "3001:3000" # - "3001:3000"
# environment: # environment:
# IMMICH_URL: http://your-internal-immich-server:2283 # IMMICH_URL: http://your-internal-immich-server:2283
# GALLERY_URL: https://your-proxy-url.com # PUBLIC_BASE_URL: https://your-proxy-url.com
# healthcheck: # healthcheck:
# test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1 # test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1
# start_period: 10s # start_period: 10s
+6 -5
View File
@@ -25,15 +25,16 @@ Accept files up to 2 GB, and send a notification to a Gotify server for each sto
## Environment variables ## Environment variables
`IMMICH_URL`, `IPP_PORT`, `IPP_CONFIG` and `CONFIG` mean the same as for IPP; see `IMMICH_URL`, `PUBLIC_BASE_URL`, `IPP_PORT`, `IPP_CONFIG` and `CONFIG` mean the same as for IPP; see
[Environment variables](/config/environment-variables). `IMMICH_URL` is required. The service has one more: [Environment variables](/config/environment-variables). `IMMICH_URL` is required, and the `environment` block from the
IPP container can be copied across as is.
### `GALLERY_URL` ### `PUBLIC_BASE_URL`
**Optional** **Optional**
The public URL of IPP, for example `https://photos.example.com`. When set, the upload page has a back button to the The public URL of IPP, for example `https://photos.example.com`, the same value as on the IPP container. When set,
share's gallery. the upload page has a back button to the share's gallery.
The service has no setting for its own public URL. It serves its pages both under `/upload` and at the root, so the The service has no setting for its own public URL. It serves its pages both under `/upload` and at the root, so the
reverse proxy decides where it lives: a path on the IPP hostname (`photos.example.com/upload`) or a hostname of its reverse proxy decides where it lives: a path on the IPP hostname (`photos.example.com/upload`) or a hostname of its
+1 -1
View File
@@ -61,7 +61,7 @@ services:
- "3001:3000" - "3001:3000"
environment: environment:
IMMICH_URL: http://your-internal-immich-server:2283 IMMICH_URL: http://your-internal-immich-server:2283
GALLERY_URL: https://your-proxy-url.com PUBLIC_BASE_URL: https://your-proxy-url.com
healthcheck: healthcheck:
test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1 test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1
start_period: 10s start_period: 10s
+3 -4
View File
@@ -70,16 +70,15 @@ services:
- "3001:3000" - "3001:3000"
environment: environment:
IMMICH_URL: http://your-internal-immich-server:2283 IMMICH_URL: http://your-internal-immich-server:2283
GALLERY_URL: https://photos.example.com PUBLIC_BASE_URL: https://photos.example.com
healthcheck: healthcheck:
test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1 test: curl -sf -m 4 http://localhost:3000/healthcheck -o /dev/null || exit 1
start_period: 10s start_period: 10s
timeout: 5s timeout: 5s
``` ```
- `IMMICH_URL` is the same local Immich address that IPP uses. - `IMMICH_URL` and `PUBLIC_BASE_URL` mean the same as on the IPP container, so you can copy the `environment` block
- `GALLERY_URL` is the public URL of IPP, the same value as IPP's `PUBLIC_BASE_URL`. It gives the upload page a back across. `PUBLIC_BASE_URL` is IPP's public URL; it gives the upload page a back button to the gallery.
button to the gallery.
The service has no setting for its own public URL. Your reverse proxy decides that in the next step. The service has no setting for its own public URL. Your reverse proxy decides that in the next step.
+6 -2
View File
@@ -2,9 +2,13 @@ import { getConfigOption, getNumericConfigOption } from '@ipp/core'
const MB = 1024 * 1024 const MB = 1024 * 1024
/** IPP's public URL from `GALLERY_URL`, without a trailing slash, or undefined when unset. */ /**
* IPP's public URL from `PUBLIC_BASE_URL`, without a trailing slash, or
* undefined when unset. The same name and value as on the IPP container, so
* the two environment blocks in a compose file match.
*/
export function galleryUrl (): string | undefined { export function galleryUrl (): string | undefined {
return (process.env.GALLERY_URL || '').replace(/\/+$/, '') || undefined return (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '') || undefined
} }
/** Largest single file accepted, in bytes, from `ipp.upload.maxFileSize` (MB). */ /** Largest single file accepted, in bytes, from `ipp.upload.maxFileSize` (MB). */
+1 -1
View File
@@ -7,7 +7,7 @@ export interface UploadPageProps {
config: UploadPageConfig config: UploadPageConfig
/** Path prefix the app is mounted under, without a trailing slash. Empty at the root. */ /** Path prefix the app is mounted under, without a trailing slash. Empty at the root. */
basePath: string basePath: string
/** This share's gallery on IPP, when `GALLERY_URL` is set. */ /** This share's gallery on IPP, when `PUBLIC_BASE_URL` is set. */
galleryLink?: string galleryLink?: string
} }