disable healthy checks for docker-poryx and dummy app in ui tests, add --no-reload-linux flag to generator and fix missing self arg in autoconf

This commit is contained in:
bunkerity 2023-03-24 13:58:27 +01:00
parent 041142a4f3
commit 1cf4a5665d
4 changed files with 9 additions and 4 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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")"