use docker 0.4 branch until we get it merged upstream