streamline dockerfile

Conflicts:
	Dockerfile
	composer.json