From dfb6149ecdbc5771d4f7355090831e625213be92 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 8 Jul 2020 09:18:17 +0200 Subject: [PATCH] Update startapp.sh --- startapp.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/startapp.sh b/startapp.sh index b8e84c0..371d8d8 100644 --- a/startapp.sh +++ b/startapp.sh @@ -16,6 +16,12 @@ if [ -f "/run/secrets/idrac_port" ]; then IDRAC_PORT="$(cat /run/secrets/idrac_port)" fi + +if [ -f "/run/secrets/idrac_vport" ]; then + echo "Using Docker secret for IDRAC_VPORT" + IDRAC_VPORT="$(cat /run/secrets/idrac_vport)" +fi + if [ -f "/run/secrets/idrac_user" ]; then echo "Using Docker secret for IDRAC_USER" IDRAC_USER="$(cat /run/secrets/idrac_user)" @@ -38,6 +44,12 @@ if [ -z "${IDRAC_PORT}" ]; then exit 1 fi +if [ -z "${IDRAC_VPORT}" ]; then + echo "${RED}Please set a proper idrac vport with IDRAC_VPORT${NC}" + sleep 2 + exit 1 +fi + if [ -z "${IDRAC_USER}" ]; then echo "${RED}Please set a proper idrac user with IDRAC_USER${NC}" sleep 2 @@ -119,4 +131,4 @@ if [ -n "$IDRAC_KEYCODE_HACK" ]; then export LD_PRELOAD=/keycode-hack.so fi -exec java -cp avctKVM.jar -Djava.library.path="./lib" com.avocent.idrac.kvm.Main ip=${IDRAC_HOST} kmport=5900 vport=5900 user=${IDRAC_USER} passwd=${IDRAC_PASSWORD} apcp=1 version=2 vmprivilege=true "helpurl=https://${IDRAC_HOST}:443/help/contents.html" +exec java -cp avctKVM.jar -Djava.library.path="./lib" com.avocent.idrac.kvm.Main ip=${IDRAC_HOST} kmport=${IDRAC_VPORT} vport=${IDRAC_VPORT} user=${IDRAC_USER} passwd=${IDRAC_PASSWORD} apcp=1 version=2 vmprivilege=true "helpurl=https://${IDRAC_HOST}:443/help/contents.html"