diff --git a/server/Dockerfile b/server/Dockerfile
index 2c66c0af3..c1615d501 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,5 +1,5 @@
# dev build
-FROM ghcr.io/immich-app/base-server-dev:20240312@sha256:3cb168dd87a2b412b25c512ec638a1e7f362e1d3eb8dd19a38d92d4a7c47999c as dev
+FROM ghcr.io/immich-app/base-server-dev:20240326@sha256:d945aba864051b30888617f36446f86b72c4bc7ad6476b9dd2aaa0c4c4e3c945 as dev
RUN apt-get install --no-install-recommends -yqq tini
WORKDIR /usr/src/app
@@ -24,7 +24,7 @@ RUN npm prune --omit=dev --omit=optional
COPY --from=dev /usr/src/app/node_modules/@img ./node_modules/@img
# web build
-FROM node:iron-alpine3.18@sha256:a02826c7340c37a29179152723190bcc3044f933c925f3c2d78abb20f794de3f as web
+FROM node:iron-alpine3.18@sha256:876514790dabd49fae7d9c4dfbba027954bd91d8e7d36da76334466533bc6b0c as web
WORKDIR /usr/src/open-api/typescript-sdk
COPY open-api/typescript-sdk/package*.json open-api/typescript-sdk/tsconfig*.json ./
@@ -40,7 +40,7 @@ RUN npm run build
# prod build
-FROM ghcr.io/immich-app/base-server-prod:20240312@sha256:8359fb1acc56580f2b4835e273293fdaa99d273b210892e1485fc6f1e47cf2bb
+FROM ghcr.io/immich-app/base-server-prod:20240326@sha256:28ad98fed8d746b5f92de49ff776cfdff7399df163ebeda2f37a01f473965841
WORKDIR /usr/src/app
ENV NODE_ENV=production \
@@ -53,7 +53,7 @@ COPY --from=web /usr/src/app/build ./www
COPY server/resources resources
COPY server/package.json server/package-lock.json ./
COPY server/start*.sh ./
-RUN npm link && npm cache clean --force
+RUN npm link && npm install -g @immich/cli && npm cache clean --force
COPY LICENSE /licenses/LICENSE.txt
COPY LICENSE /LICENSE
ENV PATH="${PATH}:/usr/src/app/bin"
Error, web/README.md do not exists
diff --git a/web/Dockerfile b/web/Dockerfile
index 27d206e92..422ad9746 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:iron-alpine3.18@sha256:a02826c7340c37a29179152723190bcc3044f933c925f3c2d78abb20f794de3f
+FROM node:iron-alpine3.18@sha256:876514790dabd49fae7d9c4dfbba027954bd91d8e7d36da76334466533bc6b0c
RUN apk add --no-cache tini
USER node
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 46b4a44a8..7f27798c5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
#
# WARNING: Make sure to use the docker-compose.yml of the current release:
#
diff --git a/docs/docs/features/command-line-interface.md b/docs/docs/features/command-line-interface.md
index 360b3c372..094de609f 100644
--- a/docs/docs/features/command-line-interface.md
+++ b/docs/docs/features/command-line-interface.md
@@ -1,6 +1,6 @@
# The Immich CLI
-Immich has a CLI that allows you to perform certain actions from the command line. This CLI replaces the [legacy CLI](https://github.com/immich-app/CLI) that was previously available. The CLI is hosted in the [cli folder of the the main Immich github repository](https://github.com/immich-app/immich/tree/main/cli).
+Immich has a command line interface (CLI) that allows you to perform certain actions from the command line.
## Features
@@ -55,14 +55,17 @@ Command line interface for Immich
Options:
-V, --version output the version number
- -d, --config Configuration directory (env: IMMICH_CONFIG_DIR)
+ -d, --config-directory <directory> Configuration directory where auth.yml will be stored (default: "~/.config/immich/", env:
+ IMMICH_CONFIG_DIR)
+ -u, --url [url] Immich server URL (env: IMMICH_INSTANCE_URL)
+ -k, --key [key] Immich API key (env: IMMICH_API_KEY)
-h, --help display help for command
Commands:
- upload [options] [paths...] Upload assets
- server-info Display server information
- login-key [instanceUrl] [apiKey] Login using an API key
+ login|login-key <url> <key> Login using an API key
logout Remove stored credentials
+ server-info Display server information
+ upload [options] [paths...] Upload assets
help [command] display help for command
@@ -71,7 +74,7 @@ Commands:
The upload command supports the following options:
-Usage: immich upload [options] [paths...]
+Usage: immich upload [paths...] [options]
Upload assets
@@ -80,12 +83,13 @@ Arguments:
Options:
-r, --recursive Recursive (default: false, env: IMMICH_RECURSIVE)
- -i, --ignore [paths...] Paths to ignore (env: IMMICH_IGNORE_PATHS)
+ -i, --ignore [paths...] Paths to ignore (default: [], env: IMMICH_IGNORE_PATHS)
-h, --skip-hash Don't hash files before upload (default: false, env: IMMICH_SKIP_HASH)
-H, --include-hidden Include hidden folders (default: false, env: IMMICH_INCLUDE_HIDDEN)
-a, --album Automatically create albums based on folder name (default: false, env: IMMICH_AUTO_CREATE_ALBUM)
-A, --album-name <name> Add all assets to specified album (env: IMMICH_ALBUM_NAME)
-n, --dry-run Don't perform any actions, just show what will be done (default: false, env: IMMICH_DRY_RUN)
+ -c, --concurrency <number> Number of assets to upload at the same time (default: 4, env: IMMICH_UPLOAD_CONCURRENCY)
--delete Delete local assets after upload (env: IMMICH_DELETE_ASSETS)
--help display help for command
@@ -97,13 +101,13 @@ Note that the above options can read from environment variables as well.
You begin by authenticating to your Immich server.
This will store your credentials in a auth.yml file in the configuration directory which defaults to ~/.config/. The directory can be set with the -d option or the environment variable IMMICH_CONFIG_DIR. Please keep the file secure, either by performing the logout command after you are done, or deleting it manually.
/home/runner/work/immich-distribution/immich-distribution
/tmp/tmp.y7ZfpjsVJx removed
## Base image
Check the base images for recent relevant changes:
* https://github.com/immich-app/base-images/commits/main/
## Checklist
* Review the changes above
* Possible write a news entry (and push it to this PR)
* Wait for the CI to finish
* Merge the PR
ref #168
This PR bumps the version from v1.99.0 to v1.100.0. Please review the changes and merge this PR if everything looks good.
Upstream release notes
Monitored upstream files
Error, server/src/infra/migrations do not exists
Error, web/README.md do not exists
@@ -71,7 +74,7 @@ Commands: The upload command supports the following options:
@@ -97,13 +101,13 @@ Note that the above options can read from environment variables as well. You begin by authenticating to your Immich server.
For instance,
This will store your credentials in a
auth.ymlfile in the configuration directory which defaults to~/.config/. The directory can be set with the-doption or the environment variableIMMICH_CONFIG_DIR. Please keep the file secure, either by performing the logout command after you are done, or deleting it manually.