Revert "run mariadb and then teleport"
Build and Push Docker Container / build-and-push (push) Successful in 6m14s
Build and Push Docker Container / build-and-push (push) Successful in 6m14s
This reverts commit 74aa3d254b.
This commit is contained in:
@@ -709,11 +709,12 @@ _main_mariadb() {
|
|||||||
docker_mariadb_upgrade "$@"
|
docker_mariadb_upgrade "$@"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
exec "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
_check_to_run_teleport() {
|
||||||
if [ -f "/etc/teleport.yaml" ]; then
|
if [ -f "/etc/teleport.yaml" ]; then
|
||||||
exec "$@" &
|
teleport start -c /etc/teleport.yaml &
|
||||||
else
|
|
||||||
exec "$@"
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -736,12 +737,8 @@ _run_web_server() {
|
|||||||
|
|
||||||
# If we are sourced from elsewhere, don't perform any further actions
|
# If we are sourced from elsewhere, don't perform any further actions
|
||||||
if ! _is_sourced; then
|
if ! _is_sourced; then
|
||||||
|
_check_to_run_teleport
|
||||||
_run_web_server
|
_run_web_server
|
||||||
|
|
||||||
if [ -f "/etc/teleport.yaml" ]; then
|
_main_mariadb "$@"
|
||||||
_main_mariadb "$@"
|
|
||||||
teleport start -c /etc/teleport.yaml
|
|
||||||
else
|
|
||||||
_main_mariadb "$@"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user