- Change SSL to only be enabled via an environment variable. Nginx will be terminating SSL for the ER.

- Add the missing dependencies to the requirements.txt
- Change the builder ports to non-standard locations
- Add the /b1/socket and /b1/controller endpoints in nginx, to map to the build manager
- Have the build manager start automatically.
This commit is contained in:
Joseph Schorr 2014-11-25 18:08:18 -05:00
parent 04fc6d82a5
commit 9d675b51ed
9 changed files with 45 additions and 6 deletions

View file

@ -26,10 +26,11 @@ def run_build_manager():
LOGGER.debug('Starting build manager with lifecycle "%s"', build_manager_config[0])
ssl_context = None
if os.path.exists('conf/stack/ssl.cert'):
if os.environ.get('SSL_CONFIG'):
LOGGER.debug('Loading SSL cert and key')
ssl_context = SSLContext()
ssl_context.load_cert_chain('conf/stack/ssl.cert', 'conf/stack/ssl.key')
ssl_context.load_cert_chain(os.environ.get('SSL_CONFIG') + '/ssl.cert',
os.environ.get('SSL_CONFIG') + '/ssl.key')
server = BuilderServer(app.config['SERVER_HOSTNAME'], dockerfile_build_queue, build_logs,
user_files, manager_klass)