discipline vs punishment

discipline and punishment both are nouns.

Word	Noun	Adjective	Verb	Adverb
discipline	Yes	No	Yes	No
punishment	Yes	No	No	No

As nouns, punishment is a hypernym of discipline; that is, punishment is a word with a broader meaning than discipline:

Other hypernyms of discipline include penalisation, penalization, penalty.

discipline (noun)	punishment (noun)
training to improve strength or self-control	the act of punishing, or the infliction of a penalty
the act of disciplining
the trait of being well behaved
a branch of knowledge
a system of rules of conduct or method of practice

discipline (verb)	punishment (verb)
punish in order to gain control or enforce obedience
develop (a child's or animal's) behavior by instruction and practice; especially to teach self-control