Skip to content

Commit

Permalink
Merge branch 'main' into renovate/flutter_udid-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
shenlong-tanwen authored Feb 23, 2024
2 parents a77e351 + 07d7472 commit c15385c
Show file tree
Hide file tree
Showing 168 changed files with 2,876 additions and 2,222 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,9 @@ If you feel like this is the right cause and the app is something you are seeing
<a href="https://github.com/alextran1502/immich/graphs/contributors">
<img src="https://contrib.rocks/image?repo=immich-app/immich" width="100%"/>
</a>

## Star History

<a href="https://star-history.com/#immich-app/immich">
<img src="https://api.star-history.com/svg?repos=immich-app/immich&type=Date" alt="Star History Chart" width="100%" />
</a>
24 changes: 12 additions & 12 deletions cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docker/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ x-server-build: &server-common
services:
immich-server:
container_name: immich_server
command: [ "./start-server.sh" ]
command: [ "start.sh", "immich" ]
<<: *server-common
ports:
- 2283:3001
Expand All @@ -27,7 +27,7 @@ services:

immich-microservices:
container_name: immich_microservices
command: [ "./start-microservices.sh" ]
command: [ "start.sh", "microservices" ]
<<: *server-common
# extends:
# file: hwaccel.transcoding.yml
Expand Down
1 change: 1 addition & 0 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name: immich-e2e

x-server-build: &server-common
image: immich-server:latest
container_name: immich-e2e-server
build:
context: ../
dockerfile: server/Dockerfile
Expand Down
11 changes: 8 additions & 3 deletions e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c15385c

Please sign in to comment.