trying to mitigate supervisor-nginx incompatibility that leads to 100% CPU usage by supervisor
fix jenkins: although it started it didn't work properly due to permission issues
Preparing mongo-ram for production. Special build command for uat-marine-ondemand and no more creating tmpfs inside container due to security concerns.
add volume since we will mount the ramdrive from the host
Adding 2nd elasticsearch mapping
New dockerfile 'collector' to run the weather collector.
Merge branch 'master' of github.com:marine-travel/marine-docker
configuration file for uat on-demand
Merge branch 'master' into marine-admin-tool