Add docker support for development via docker-compose. Closes #1078

This will allow developers to have a running DemocracyOS environment, with build-watch-serve functionalities; just run `docker-compose up app`.
DemocracyOS · May 26, 2016 · 5f22d8b · 5f22d8b
1 parent 6059490
commit 5f22d8b
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 23 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,7 +3,17 @@
 .env
 .DS_Store
 .dockerignore
+docker
+docs
+node_modules
 
 config/*.json
+!config/defaults.json
+
+# Docs
+*.md
 
 Procfile
+
+# Never leave out the license
+!LICENSE.txt
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@
 *.pid
 *.seed
 *.sublime-*
-.env
 .idea/*
 .npmrc
 .tmp

diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -24,9 +24,13 @@ packages:
 	@echo "Installing dependencies..."
 	@npm install
 
+docker:
+	@echo "Starting DemocracyoOS docker development environment..."
+	@docker-compose up app
+
 clean:
 	@echo "Removing dependencies, components and built assets..."
 	@rm -rf node_modules components public
 	@echo "Done.\n"
 
-.PHONY: clean
+.PHONY: clean docker
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '2'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: ./docker/development.Dockerfile
+    env_file: docker/.env
+    links:
+      - mongo
+    ports:
+      - "3000:3000"
+    # mount source volume, but
+    # don't overwrite `node_modules` or mirror dir from container
+    volumes:
+      - ${PWD}:/usr/src
+      - /usr/src/node_modules
+    tty: true
+
+  mongo:
+    image: mongo
+    # Optionally mount external data directory
+    # volumes:
+    #   - path-to-your-data-dir:/data/db
diff --git a/docker/.env b/docker/.env
@@ -0,0 +1,2 @@
+# Required for running under docker compose
+MONGO_URL=mongodb://mongo/DemocracyOS-dev
diff --git a/docker/development.Dockerfile b/docker/development.Dockerfile
@@ -0,0 +1,16 @@
+FROM node:argon
+MAINTAINER Guido Vilariño <guido@democracyos.org>
+
+RUN apt-get update && \
+  apt-get install -y libkrb5-dev && \
+  npm config set python python2.7
+
+COPY package.json /usr/src/
+
+WORKDIR /usr/src
+
+RUN npm install --quiet --unsafe-perm
+
+EXPOSE 3000
+
+CMD ["./node_modules/.bin/gulp", "bws"]
diff --git a/lib/boot/index.js b/lib/boot/index.js
@@ -186,7 +186,7 @@ app.use(express.errorHandler());
 /**
  * Load Styleguide
  */
-if ('development' === config.env) {
+if ('production' !== config.env) {
   app.use(require('lib/styleguide'));
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
     *.pid
     *.seed
     *.sublime-*
-    .env
     .idea/*
     .npmrc
     .tmp
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Required for running under docker compose
		MONGO_URL=mongodb://mongo/DemocracyOS-dev