This commit is contained in:
@@ -558,6 +558,7 @@ if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
$SUDO_CMD docker pull registry.format.hu/installer-tool
|
$SUDO_CMD docker pull registry.format.hu/installer-tool
|
||||||
|
$SUDO_CMD docker pull registry.format.hu/setup
|
||||||
|
|
||||||
# first install
|
# first install
|
||||||
if [ ! -f "/etc/user/config/system.json" ]; then
|
if [ ! -f "/etc/user/config/system.json" ]; then
|
||||||
@@ -601,14 +602,12 @@ if [ ! -f "/etc/user/config/system.json" ]; then
|
|||||||
if [ "$DISCOVERY_DIR" != "" ]; then
|
if [ "$DISCOVERY_DIR" != "" ]; then
|
||||||
VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR";
|
VAR_DISCOVERY_DIR="--env DISCOVERY_DIR=$DISCOVERY_DIR";
|
||||||
VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";
|
VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";
|
||||||
echo "VAR_DISCOVERY_DIRECTORY="--volume $DISCOVERY_DIR/:$DISCOVERY_DIR/";"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
|
if [ "$DISCOVERY_CONFIG_FILE" != "" ]; then
|
||||||
VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE";
|
VAR_DISCOVERY_CONFIG_FILE="--env DISCOVERY_CONFIG_FILE=$DISCOVERY_CONFIG_FILE";
|
||||||
if [ "$DISCOVERY_CONFIG_DIR" != "" ]; then
|
if [ "$DISCOVERY_CONFIG_DIR" != "" ]; then
|
||||||
VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/";
|
VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/";
|
||||||
echo "VAR_DISCOVERY_CONFIG_DIRECTORY="--volume $DISCOVERY_CONFIG_DIR/:$DISCOVERY_CONFIG_DIR/";"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user