diff --git a/root/usr/libexec/apps/seafile/seafile.sh b/root/usr/libexec/apps/seafile/seafile.sh index ca2cf95..50b0355 100644 --- a/root/usr/libexec/apps/seafile/seafile.sh +++ b/root/usr/libexec/apps/seafile/seafile.sh @@ -4,40 +4,37 @@ ACTION=${1} shift 1 get_image() { - IMAGE_NAME="seafileltd/seafile-mc:latest" + IMAGE_NAME=$(uci get seafile.@seafile[0].image_name 2>/dev/null) } do_install_detail() { - local config=`uci get seafile.@seafile[0].config_path 2>/dev/null` - local port=`uci get seafile.@seafile[0].port 2>/dev/null` - local IMAGE_NAME=`uci get seafile.@seafile[0].image_name 2>/dev/null` - local username=`uci get seafile.@seafile[0].username 2>/dev/null` - local password=`uci get seafile.@seafile[0].password 2>/dev/null` - - #Generate the generic environment variables for the docker-compose + local config=$(uci get seafile.@seafile[0].config_path 2>/dev/null) + local port=$(uci get seafile.@seafile[0].port 2>/dev/null) + local IMAGE_NAME=$(uci get seafile.@seafile[0].image_name 2>/dev/null) + local username=$(uci get seafile.@seafile[0].username 2>/dev/null) + local password=$(uci get seafile.@seafile[0].password 2>/dev/null) GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) - - # Get our local LAN IP Address + LAN_IP=$(uci get network.lan.ipaddr) - # Strip trailing network mask LAN_IP="${LAN_IP%/*}" - - if [ -z "$config" ]; then - echo "config path is empty!" - exit 1 - fi + [ -z "$config" ] && { echo "config path is empty!"; exit 1; } [ -z "$port" ] && port=8160 - [ -z "$IMAGE_NAME" ] && IMAGE_NAME=seafileltd/seafile-mc:latest - - - # Create Docker Compose file with custom variables - - # Create Docker Compose file with custom variables -touch docker-compose.yml -cat > docker-compose.yml < /opt/docker2/compose/seafile-app/docker-compose.yml <