cotugno/immich
2
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-15 09:59:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: shell scripts (#7189)

Browse Source 
* fix: bash scripts

* fix: use bash

* fix: e2e
This commit is contained in:
martin 2024-02-19 03:57:24 +01:00 committed by GitHub
parent ddae707ea9
commit 66d3daa074
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.sh
View File

@ -38,9 +38,9 @@ populate_upload_location() {
start_docker_compose() {
echo "Starting Immich's docker containers"
if docker compose > /dev/null 2>&1; then
if docker compose >/dev/null 2>&1; then
docker_bin="docker compose"
elif docker-compose > /dev/null 2>&1; then
elif docker-compose >/dev/null 2>&1; then
docker_bin="docker-compose"
else
echo "Cannot find \`docker compose\` or \`docker-compose\`."

2
server/Dockerfile
View File

@ -59,4 +59,4 @@ COPY LICENSE /LICENSE
ENV PATH="${PATH}:/usr/src/app/bin"
VOLUME /usr/src/app/upload
EXPOSE 3001
ENTRYPOINT ["tini", "--", "/bin/sh"]
ENTRYPOINT ["tini", "--", "/bin/bash"]

3
server/start-microservices.sh
View File

@ -1,2 +1,3 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
./start.sh microservices

3
server/start-server.sh
View File

@ -1,2 +1,3 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
./start.sh immich

53
server/start.sh
View File

@ -1,42 +1,17 @@
#!/usr/bin/env sh
#!/usr/bin/env bash
lib_path="/usr/lib/$(arch)-linux-gnu/libmimalloc.so.2"
export LD_PRELOAD="$lib_path"
if [ "$DB_URL_FILE" ]; then
DB_URL_CONTENT=$(cat "$DB_URL_FILE")
export DB_URL="$DB_URL_CONTENT"
unset DB_URL_FILE
fi
if [ "$DB_HOSTNAME_FILE" ]; then
DB_HOSTNAME_CONTENT=$(cat "$DB_HOSTNAME_FILE")
export DB_HOSTNAME="$DB_HOSTNAME_CONTENT"
unset DB_HOSTNAME_FILE
fi
if [ "$DB_DATABASE_NAME_FILE" ]; then
DB_DATABASE_CONTENT=$(cat "$DB_DATABASE_NAME_FILE")
export DB_DATABASE_NAME="$DB_DATABASE_CONTENT"
unset DB_DATABASE_NAME_FILE
fi
if [ "$DB_USERNAME_FILE" ]; then
DB_USERNAME_CONTENT=$(cat "$DB_USERNAME_FILE")
export DB_USERNAME="$DB_USERNAME_CONTENT"
unset DB_USERNAME_FILE
fi
if [ "$DB_PASSWORD_FILE" ]; then
DB_PASSWORD_CONTENT=$(cat "$DB_PASSWORD_FILE")
export DB_PASSWORD="$DB_PASSWORD_CONTENT"
unset DB_PASSWORD_FILE
fi
if [ "$REDIS_PASSWORD_FILE" ]; then
REDIS_PASSWORD_CONTENT=$(cat "$REDIS_PASSWORD_FILE")
export DB_PASSWORD="$REDIS_PASSWORD_CONTENT"
unset REDIS_PASSWORD_FILE
fi
read_file_and_export() {
if [ -n "${!1}" ]; then
content="$(cat "${!1}")"
export "$2"="${content}"
unset "$1"
fi
}
read_file_and_export "DB_URL_FILE" "DB_URL"
read_file_and_export "DB_HOSTNAME_FILE" "DB_HOSTNAME"
read_file_and_export "DB_DATABASE_NAME_FILE" "DB_DATABASE_NAME"
read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"
read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"
read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"
exec node /usr/src/app/dist/main "$@"