Merge pull request #103 from cfpb/streamline-dockerfiles

Add data to container during build rather than run

.gitignore

@@ -1,3 +1,7 @@
+# Vim stuff
+*.swp
+*.swo
+
 # Logs
 logs
 *.log
@@ -38,4 +42,4 @@ dist
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 node_modules
 
-docs/*
+docs/*

data/laraggregates.js

@@ -70,7 +70,7 @@ var getData = function (activityYear) {
     });
 }
 
-var dataURI = 'https://api.consumerfinance.gov/data/hmda/slice/hmda_lar.json?&$where=as_of_year=';
+var dataURI = 'http://api.consumerfinance.gov/data/hmda/slice/hmda_lar.json?&$where=as_of_year=';
 var roughLARData = {};
 var finalLARCollection;
 var activityYears = ['2012', '2013'];

data/reload_mongo.js

@@ -42,7 +42,6 @@ var insertData = function(key, docs) {
     });
     return deferred.promise;
 };
-
 var HOST = ENV_HOST || config.mongoConfig.host || '127.0.0.1';
 var PORT = ENV_PORT || config.mongoConfig.port || '21717';
 var DB = config.mongoConfig.database || 'hmda';

mongo-docker/Dockerfile

@@ -5,14 +5,14 @@ ENV NODE_ENV=production
 COPY mongo-docker /tmp
 
 # Build
-RUN /tmp/run.sh && rm /tmp/run.sh
+RUN /tmp/run.sh
 
 # Tests
-RUN /tmp/tests.sh && rm /tmp/tests.sh
+RUN /tmp/tests.sh
 
 # Install app
 COPY . /usr/local/app
-RUN /tmp/install-app.sh && rm /tmp/install-app.sh
+RUN /tmp/install-app.sh
 
 ENTRYPOINT ["/tmp/entrypoint.sh"]
 

mongo-docker/entrypoint.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-/tmp/reload.sh&
-
 set -e
 
 if [ "${1:0:1}" = '-' ]; then

mongo-docker/install-app.sh

@@ -1,11 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 apk --update add make g++ python git
 
 # Install app deps
 cd /usr/local/app
 npm install
 
+# Start mongo
+mongod --smallfiles&
+
+/tmp/reload.sh
+kill %%
+
 # Clean
 apk del make g++ git python
 rm -rf /var/cache/apk/*

mongo-docker/reload.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # Wait for mongod to start
-sleep 10
+sleep 5
 
 node /usr/local/app/data/reload_mongo.js