Socialism is the means of production owned by the state or the workers.

Communism is a subset of socialism, where you have a classless society. Different communist doctrines have a different view on how to achieve that.