Solr container plus some tweaks

Added solr container (already integrated with the others).

I made also some tweaks to make the build work correctly.