[Bug 1105000] harmonise docker and docker-kubic packaging