Switch over to phusion baseimage. Prevent everything from daemonizing and start it with runit under phusion. Make workers trap and handle sigint and sigterm. Extend the reservation to 1hr for dockerfilebuild. Update nginx to remove the dependency on libgd. Merge the requirements and requirements enterprise files.

workers/diffsworker.py

@@ -1,5 +1,4 @@
 import logging
-import daemon
 import argparse
 
 from data.queue import image_diff_queue
@@ -34,26 +33,16 @@ class DiffsWorker(Worker):
 
     return True
 
-
 parser = argparse.ArgumentParser(description='Worker daemon to compute diffs')
-parser.add_argument('-D', action='store_true', default=False,
-                    help='Run the worker in daemon mode.')
-parser.add_argument('--log', default='diffsworker.log',
-                    help='Specify the log file for the worker as a daemon.')
+parser.add_argument('--log', help='Specify the log file for the worker as a daemon.')
 args = parser.parse_args()
 
-
-worker = DiffsWorker(image_diff_queue)
-
-if args.D:
+if args.log is not None:
   handler = logging.FileHandler(args.log)
-  handler.setFormatter(formatter)
-  root_logger.addHandler(handler)
-  with daemon.DaemonContext(files_preserve=[handler.stream]):
-    worker.start()
-
 else:
   handler = logging.StreamHandler()
-  handler.setFormatter(formatter)
-  root_logger.addHandler(handler)
-  worker.start()
+handler.setFormatter(formatter)
+root_logger.addHandler(handler)
+
+worker = DiffsWorker(image_diff_queue)
+worker.start()