conf: add docker-compose and pure-docker deploy types (!8658) · Merge requests · Administrator / sourcegraph

Administrator requested to merge deploy-type-docker-compose into master Feb 28, 2020

Created by: ggilmore

@dadlerj I reverted https://github.com/sourcegraph/deploy-sourcegraph-docker/commit/f75a88c0a1708a3c5e26ea24b16ed191b2f1f424 because I didn't realize that new values of the DEPLOY_TYPE environment variable needed to be explicitly added to our internal configuration package. Before this revert, the frontend container would crash with the following error message:

2020/02/28 19:57:53 The 'DEPLOY_TYPE' environment variable is invalid. Expected one of: "cluster", "docker-container", "dev". Got: "docker-compose"

This PR adds support for DEPLOY_TYPE=docker-compose and DEPLOY_TYPE=pure-docker so that instances are properly classified for analytics and support purposes.

A new release (3.13.2) will need to be cut for this.

conf: add docker-compose and pure-docker deploy types

Merge request reports