Merge branch 'master' into alpine3.13

This commit is contained in:
Gerrit Gogel 2021-01-31 16:20:49 +01:00
commit 11dd0ff60b
2 changed files with 27 additions and 5 deletions

View file

@ -66,7 +66,8 @@ openjpeg \
tiff \
tk \
mariadb-dev \
libmemcached
libmemcached \
netcat-openbsd
COPY --from=get /tmp/seafile-server*/seahub /opt/seafile/seafile-server-latest/seahub
COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/runtime

View file

@ -1,16 +1,35 @@
#!/bin/bash
function start_seahub {
function init_seahub {
/scripts/create_data_links.sh
echo "{ \"email\": \"${SEAFILE_ADMIN_EMAIL}\",\"password\": \"${SEAFILE_ADMIN_PASSWORD}\"}" | tee /opt/seafile/conf/admin.txt
#/opt/seafile/seafile-server-latest/seahub.sh start
echo "{ \"email\": \"${SEAFILE_ADMIN_EMAIL}\",\"password\": \"${SEAFILE_ADMIN_PASSWORD}\"}" >/opt/seafile/conf/admin.txt
python3 /opt/seafile/seafile-server-latest/check_init_admin.py
}
function start_seahub {
echo "Starting seahub..."
python3 /opt/seafile/seafile-server-latest/seahub/manage.py runserver 0.0.0.0:8000
}
function start_socat {
mkdir -p /opt/seafile/seafile-server-latest/runtime
while true; do
socat -d -d UNIX-LISTEN:/opt/seafile/seafile-server-latest/runtime/seafile.sock,fork TCP:seafile-server:8001,forever,keepalive,keepidle=10,keepintvl=10,keepcnt=2
done
}
function watch_server {
while true; do
if ! nc -z seafile-server 8001 2>/dev/null; then
echo "Seafile server is unreachable. Stopping seahub..."
pkill -f manage.py
while ! nc -z seafile-server 8001 2>/dev/null; do
sleep 1
done
start_seahub &
fi
sleep 1
done
}
function keep_running {
@ -20,5 +39,7 @@ function keep_running {
}
start_socat &
init_seahub
start_seahub &
watch_server &
keep_running