Merge branch 'dev'

Dockerfile

@@ -1,20 +1,34 @@
 # Dockerfile for the PDC's HubDB service
 #
-# Base image
 #
-FROM mongo
+# HubDB for PDC-collected aggregate data.
+#
+# Example:
+# sudo docker pull pdcbc/hubdb
+# sudo docker run -d --name hubdb -h hubdb --restart=always \
+#   -v ${PATH_MONGO_LIVE}:/data/db/:rw \
+#   -v ${PATH_MONGO_DUMP}:/data/dump/:rw \
+#   pdcbc/hubdb:latest
+#
+# Folder paths
+# - Mongo live db: -v </path/>:/data/db/:rw
+# - Mongo dumps:   -v </path/>:/data/dump/:rw
+#
+FROM mongo:3.0
+MAINTAINER [email protected]
+ENV RELEASE 0.1.4
 
 
-# Update system, install Lynx
+# Packages
 #
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo 'Dpkg::Options{ "--force-confdef"; "--force-confold" }' \
-      >> /etc/apt/apt.conf.d/local
 RUN apt-get update; \
-    apt-get upgrade -y
+    apt-get install -y \
+    git; \
+  apt-get clean; \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 
 # Prepare /app/ folder
 #
 WORKDIR /app/
-COPY . .
+RUN git clone https://github.com/pdcbc/hubdb.git . -b ${RELEASE}

mongodb_init.sh → mongo_maint.sh

@@ -10,12 +10,7 @@ set -e -o nounset
 
 # Run after initial boot, wait 10 seconds for mongo to start
 #
-sleep 5
-
-
-# Create thirdnexts collection
-#
-mongo query_composer_development --eval 'db.createCollection("thirdnexts")'
+#sleep 5
 
 
 # Set db keys to prevent duplicates
@@ -25,12 +20,18 @@ mongo query_composer_development --eval \
 mongo query_composer_development --eval \
   'printjson( db.endpoints.ensureIndex({ base_url : 1 }, { unique : true }))'
 mongo query_composer_development --eval \
-  'printjson( db.thirdnexts.ensureIndex({ clinic: 1, date:1 }, { unique: true }))'
+  'printjson( db.users.ensureIndex({ first_name: 1, last_name:1 }, { unique: true }))'
+
+
+# Dump MongoDB, report failure if unsuccessful
+#
+mkdir -p /data/dump/
+mongodump --out /data/dump/
 
 
 # Import admin and user accounts
 #
 mongo query_composer_development --eval \
-  'db.users.insert({ "first_name" : "PDC", "last_name" : "Admin", "username" : "admin", "email" : "admin@pdc.io", "encrypted_password" : "\$2a\$10\$ZSuPxdODbumiMGOxtVSpRu0Rd0fQ2HhC7tMu2IobKTaAsPMmFlBD.", "agree_license" : true, "approved" : true, "admin" : true })'
+  'db.users.insert({ "first_name" : "PDC", "last_name" : "Admin", "username" : "admin", "email" : "admin@pdcbc.ca", "encrypted_password" : "\$2a\$10\$ZSuPxdODbumiMGOxtVSpRu0Rd0fQ2HhC7tMu2IobKTaAsPMmFlBD.", "agree_license" : true, "approved" : true, "admin" : true })'
 mongo query_composer_development --eval \
-  'db.users.insert({ "first_name" : "PDC", "last_name" : "User", "username" : "user", "email" : "user@pdc.io", "encrypted_password" : "\$2a\$10\$ZSuPxdODbumiMGOxtVSpRu0Rd0fQ2HhC7tMu2IobKTaAsPMmFlBD.", "agree_license" : true, "approved" : true, "admin" : true })'
+  'db.users.insert({ "first_name" : "PDC", "last_name" : "User", "username" : "user", "email" : "user@pdcbc.ca", "encrypted_password" : "\$2a\$10\$ZSuPxdODbumiMGOxtVSpRu0Rd0fQ2HhC7tMu2IobKTaAsPMmFlBD.", "agree_license" : true, "approved" : true, "admin" : false })'