Fix #1156 entrypoint override from base image

This fixes #1156. If there's a better way I'm happy to adjust it.