CI: merge dockerfiles

This is done for a variety of reasons. The requirement to easily add flavors in the future has been voiced in the ops jf. Merging the dockerfiles enables us to do that. The build has been moved into the dockerfile, so that a developer can locally test in the same environment that will be deployed remotely. It also makes it easier to potentially move to a different ci tool in the future.