Continue work on docker setup