Disciplined

Having strong self-control and the ability to stick to rules or goals, or punished for breaking rules.

From Latin 'disciplina' (teaching, learning, order), connected to 'disciple' (a student). The meaning evolved from 'instruction' to 'self-control' to 'punishment' over centuries.