Added tomcat port, moved "ADD" to save disk usag