Synonyms for Self-disciplined (same or very similar meaning)
WordNet sense 1 (used of nonindulgent persons):
self-restraining
WordNet sense 2 (characterized by strictness, severity, or restraint):
strict, nonindulgent
From the ODE community, based on WordNet
add/edit