move more docker work into goose
Merge commit 'HEAD@{1}'