- 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.

buildman/builder.py

@@ -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)

buildman/server.py

@@ -21,8 +21,8 @@ TIMEOUT_PERIOD_MINUTES = 20
 JOB_TIMEOUT_SECONDS = 300
 MINIMUM_JOB_EXTENSION = timedelta(minutes=2)
 
-WEBSOCKET_PORT = 8080
-CONTROLLER_PORT = 8181
+WEBSOCKET_PORT = 8787
+CONTROLLER_PORT = 8686
 
 class BuildJobResult(object):
   """ Build job result enum """
@@ -75,7 +75,8 @@ class BuilderServer(object):
     loop = trollius.get_event_loop()
     trollius.Task(self._initialize(loop, host, ssl))
 
-    LOGGER.debug('Starting server on port 8080, with controller on port 8181')
+    LOGGER.debug('Starting server on port %s, with controller on port %s', WEBSOCKET_PORT,
+                 CONTROLLER_PORT)
     try:
       loop.run_forever()
     except KeyboardInterrupt: