docker-ci production sync

Now that we have DinD in 0.6.6, this PR syncs docker-ci production code.

Do we want  to squash the commits, or rearrange them in any way?