Merge "Making docker deploy script generic"