Skip to content

Commit bc8d72b

Browse files
committed
Merge branch 'main' into fix/assetmanager-stack-updates
2 parents b080fc6 + 29f16c6 commit bc8d72b

File tree

1,019 files changed

+37726
-42655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,019 files changed

+37726
-42655
lines changed

.devcontainer/mobile/container-compose-overrides.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ services:
44
target: dev-container-mobile
55
environment:
66
- IMMICH_SERVER_URL=http://127.0.0.1:2283/
7-
- IMMICH_MEDIA_LOCATION=/data
87
volumes: !override # bind mount host to /workspaces/immich
98
- ..:/workspaces/immich
109
- cli_node_modules:/workspaces/immich/cli/node_modules

.devcontainer/server/container-compose-overrides.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ services:
66
hostname: immich-dev
77
environment:
88
- IMMICH_SERVER_URL=http://127.0.0.1:2283/
9-
- IMMICH_MEDIA_LOCATION=/data
109
volumes: !override
1110
- ..:/workspaces/immich
1211
- cli_node_modules:/workspaces/immich/cli/node_modules

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
53+
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
6363
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6464
# If this step fails, then you should remove it and run the build manually (see below)
6565
- name: Autobuild
66-
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
66+
uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
6767

6868
# ℹ️ Command-line programs to run using the OS shell.
6969
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
7676
# ./location_of_script_within_repo/buildscript.sh
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
79+
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
8080
with:
8181
category: '/language:${{matrix.language}}'

.github/workflows/static_analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130130

131131
- name: Upload SARIF file
132-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
132+
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
133133
with:
134134
sarif_file: results.sarif
135135
category: zizmor

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ jobs:
668668
contents: read
669669
services:
670670
postgres:
671-
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:1f5583fe3397210a0fbc7f11b0cec18bacc4a99e3e8ea0548e9bd6bcf26ec37a
671+
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:ec713143dca1a426eba2e03707c319e2ec3cc9d304ef767f777f8e297dee820c
672672
env:
673673
POSTGRES_PASSWORD: postgres
674674
POSTGRES_USER: postgres

.github/workflows/weblate-lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
exit 1
3939
fi
4040
- name: Find Pull Request
41-
uses: juliangruber/find-pull-request-action@48b6133aa6c826f267ebd33aa2d29470f9d9e7d0 # v1.9.0
41+
uses: juliangruber/find-pull-request-action@952b3bb1ddb2dcc0aa3479e98bb1c2d1a922f096 # v1.10.0
4242
id: find-pr
4343
with:
4444
branch: chore/translations

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"restart": true,
88
"port": 9231,
99
"name": "Immich API Server",
10-
"remoteRoot": "/usr/src/app",
10+
"remoteRoot": "/usr/src/app/server",
1111
"localRoot": "${workspaceFolder}/server"
1212
},
1313
{
@@ -16,7 +16,7 @@
1616
"restart": true,
1717
"port": 9230,
1818
"name": "Immich Workers",
19-
"remoteRoot": "/usr/src/app",
19+
"remoteRoot": "/usr/src/app/server",
2020
"localRoot": "${workspaceFolder}/server"
2121
}
2222
]

cli/package-lock.json

Lines changed: 74 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)