From 660c32f14a4bb1dd8eb092393d3e0445b1a021ff Mon Sep 17 00:00:00 2001 From: Daniel Dolezal Date: Tue, 21 Oct 2025 10:18:36 +0200 Subject: [PATCH] Revert "run mariadb and then teleport" This reverts commit 74aa3d254b725975bc29a2eb4ce6c58b084335c9. --- scripts/docker-entrypoint.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index d70617c..61f15cc 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -709,11 +709,12 @@ _main_mariadb() { docker_mariadb_upgrade "$@" fi fi + exec "$@" +} +_check_to_run_teleport() { if [ -f "/etc/teleport.yaml" ]; then - exec "$@" & - else - exec "$@" + teleport start -c /etc/teleport.yaml & fi } @@ -736,12 +737,8 @@ _run_web_server() { # If we are sourced from elsewhere, don't perform any further actions if ! _is_sourced; then + _check_to_run_teleport _run_web_server - if [ -f "/etc/teleport.yaml" ]; then - _main_mariadb "$@" - teleport start -c /etc/teleport.yaml - else - _main_mariadb "$@" - fi + _main_mariadb "$@" fi