Merge pull request #30 from totem/develop

0.7.1 Release

README.md

@@ -109,7 +109,7 @@ might be removed in future releases.
 | TOTEM_ENV | Name of totem environment (e.g. production, local, development) | local |
 | LOG_IDENTIFIER| Identifier used for centralized logging (syslog) | image-factory |
 | ENC_PASSPHRASE | Ecnryption passphrase for git key (in etcd) | |
-
+| CONCURRENCY | Number of concurrent runners for image factory | 2 |
 
 ## Prerequisites (Development)
 + [NodeJS](http://nodejs.org)

bin/image-factory

@@ -13,6 +13,7 @@ var winston = require('winston'),
     path = require('path'),
     fs = require('fs'),
     swfHelper = require('../lib/swf/helper'),
+    _ = require('lodash'),
     swfRegister = require('../lib/swf/register'),
     ImageFactoryActivities = require('../lib/swf/image-factory-activities'),
     Factory = require('../lib/factory');
@@ -76,7 +77,9 @@ function main() {
 
     // Run the master
   try {
-    var factory = new Factory(config);
+    var factory = new Factory(_.merge({}, config, {
+      concurrentJobs: process.env.CONCURRENCY
+    }));
     winston.log('info', 'Image factory running.');
     if(JSON.parse((process.env.SWF_ENABLED || 'false').toLowerCase())) {
       var swfConfig = config.swf || {

bin/supervisord-wrapper.sh

@@ -20,6 +20,7 @@ export AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'
 export AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'
 export AWS_SWF_DOMAIN='${AWS_SWF_DOMAIN:-totem-local}'
 export LOG_IDENTIFIER='${LOG_IDENTIFIER:-image-factory}'
+export CONCURRENCY='${CONCURRENCY:-2}'
 END
 
 if [ -e /var/run/docker.sock ]; then

package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-factory",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Docker Image Factory",
   "keywords": [
     "docker",