diff --git a/src/autoconf/Controller.py b/src/autoconf/Controller.py index 732fd0acb..39cd17804 100644 --- a/src/autoconf/Controller.py +++ b/src/autoconf/Controller.py @@ -75,7 +75,7 @@ class Controller(ABC): def _get_static_services(self): pass - def _set_autoconf_load_db(): + def _set_autoconf_load_db(self): if not self._config._db.is_autoconf_loaded(): ret = self._config._db.set_autoconf_load(True) if ret: diff --git a/src/common/gen/main.py b/src/common/gen/main.py index 98769d01c..31438bbec 100644 --- a/src/common/gen/main.py +++ b/src/common/gen/main.py @@ -70,6 +70,11 @@ if __name__ == "__main__": type=str, help="path to the file containing environment variables", ) + parser.add_argument( + "--no-linux-reload", + action="store_true", + help="disable linux reload" + ) args = parser.parse_args() logger.info("Generator started ...") @@ -160,7 +165,7 @@ if __name__ == "__main__": ) templator.render() - if integration == "Linux": + if integration == "Linux" and not args.no_linux_reload: retries = 0 while not Path("/var/tmp/bunkerweb/nginx.pid").exists(): if retries == 5: diff --git a/src/linux/scripts/start.sh b/src/linux/scripts/start.sh index 09ab20a26..db986f615 100644 --- a/src/linux/scripts/start.sh +++ b/src/linux/scripts/start.sh @@ -91,7 +91,7 @@ function start() { if [ ! -f /var/tmp/bunkerweb/tmp.env ] ; then echo -ne "IS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n" > /var/tmp/bunkerweb/tmp.env fi - /usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env + /usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env --no-linux-reload if [ $? -ne 0 ] ; then log "ENTRYPOINT" "❌" "Error while generating config from /var/tmp/bunkerweb/tmp.env" exit 1 diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh index 30d975058..ca9c3951c 100755 --- a/tests/ui/tests.sh +++ b/tests/ui/tests.sh @@ -21,7 +21,7 @@ if [ $? -ne 0 ] ; then fi i=0 while [ $i -lt 120 ] ; do - containers=("ui_bw_1" "ui_bw-scheduler_1" "ui_bw-ui_1" "ui_bw-docker-proxy_1" "ui_app1_1") + containers=("ui_bw_1" "ui_bw-scheduler_1" "ui_bw-ui_1") healthy="true" for container in "${containers[@]}" ; do check="$(docker inspect --format "{{json .State.Health }}" $container | grep "healthy")"