diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6f59993e08..eb450698ad 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -352,5 +352,6 @@ _main() {
 }
 
 if ! _is_sourced; then
+	test -n "${ENTRYPOINT_XTRACE:-}" && set -x
 	_main "$@"
 fi