-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/immich-app/immich into feat…
…/inline-offline-check
- Loading branch information
Showing
102 changed files
with
2,945 additions
and
1,961 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
.env | ||
library |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,16 @@ | ||
ARG BASEIMAGE=mcr.microsoft.com/devcontainers/typescript-node:22@sha256:9791f4aa527774bc370c6bd2f6705ce5a686f1e6f204badd8dfaacce28c631ae | ||
FROM ${BASEIMAGE} | ||
|
||
# Flutter SDK | ||
# https://flutter.dev/docs/development/tools/sdk/releases?tab=linux | ||
ENV FLUTTER_CHANNEL="stable" | ||
ENV FLUTTER_VERSION="3.24.5" | ||
ENV FLUTTER_HOME=/flutter | ||
ENV PATH=${PATH}:${FLUTTER_HOME}/bin | ||
|
||
# Flutter SDK | ||
RUN mkdir -p ${FLUTTER_HOME} \ | ||
&& curl -C - --output flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.tar.xz \ | ||
&& tar -xf flutter.tar.xz --strip-components=1 -C ${FLUTTER_HOME} \ | ||
&& rm flutter.tar.xz \ | ||
&& chown -R 1000:1000 ${FLUTTER_HOME} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,26 @@ | ||
{ | ||
"name": "Immich devcontainers", | ||
"build": { | ||
"dockerfile": "Dockerfile", | ||
"args": { | ||
"BASEIMAGE": "mcr.microsoft.com/devcontainers/typescript-node:22" | ||
} | ||
}, | ||
"customizations": { | ||
"vscode": { | ||
"extensions": [ | ||
"svelte.svelte-vscode" | ||
] | ||
} | ||
}, | ||
"forwardPorts": [], | ||
"postCreateCommand": "make install-all", | ||
"remoteUser": "node" | ||
"name": "Immich", | ||
"service": "immich-devcontainer", | ||
"dockerComposeFile": [ | ||
"docker-compose.yml", | ||
"../docker/docker-compose.dev.yml" | ||
], | ||
"customizations": { | ||
"vscode": { | ||
"extensions": [ | ||
"Dart-Code.dart-code", | ||
"Dart-Code.flutter", | ||
"dbaeumer.vscode-eslint", | ||
"dcmdev.dcm-vscode-extension", | ||
"esbenp.prettier-vscode", | ||
"svelte.svelte-vscode" | ||
] | ||
} | ||
}, | ||
"forwardPorts": [], | ||
"initializeCommand": "bash .devcontainer/scripts/initializeCommand.sh", | ||
"onCreateCommand": "bash .devcontainer/scripts/onCreateCommand.sh", | ||
"overrideCommand": true, | ||
"workspaceFolder": "/immich", | ||
"remoteUser": "node" | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
services: | ||
immich-devcontainer: | ||
build: | ||
dockerfile: Dockerfile | ||
extra_hosts: | ||
- 'host.docker.internal:host-gateway' | ||
volumes: | ||
- ..:/immich:cached |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#!/bin/bash | ||
|
||
# If .env file does not exist, create it by copying example.env from the docker folder | ||
if [ ! -f ".devcontainer/.env" ]; then | ||
cp docker/example.env .devcontainer/.env | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
#!/bin/bash | ||
|
||
# Enable multiarch for arm64 if necessary | ||
if [ "$(dpkg --print-architecture)" = "arm64" ]; then | ||
sudo dpkg --add-architecture amd64 && \ | ||
sudo apt-get update && \ | ||
sudo apt-get install -y --no-install-recommends \ | ||
qemu-user-static \ | ||
libc6:amd64 \ | ||
libstdc++6:amd64 \ | ||
libgcc1:amd64 | ||
fi | ||
|
||
# Install DCM | ||
wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg | ||
sudo echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list | ||
|
||
sudo apt-get update | ||
sudo apt-get install dcm | ||
|
||
dart --disable-analytics | ||
|
||
# Install immich | ||
cd /immich || exit | ||
make install-all |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,6 +129,8 @@ describe('/users', () => { | |
expect(body).toEqual({ | ||
...before, | ||
updatedAt: expect.any(String), | ||
profileChangedAt: expect.any(String), | ||
createdAt: expect.any(String), | ||
name: 'Name', | ||
}); | ||
}); | ||
|
@@ -177,6 +179,8 @@ describe('/users', () => { | |
...before, | ||
email: '[email protected]', | ||
updatedAt: expect.anything(), | ||
createdAt: expect.anything(), | ||
profileChangedAt: expect.anything(), | ||
}); | ||
}); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.