Merge pull request #1 from EIrwin/master

jameshibbard · web-flow · commit 2cdc271efd9c · 2016-11-04T09:08:36.000+01:00
Setup to run using Docker Compose
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,5 @@ node_modules
 
 /public/
 dist/
+
+.idea
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,18 @@
+FROM node:6.6.0-slim
+MAINTAINER Eric Irwin <Eric.Irwin1124@gmail.com>
+
+# Expose the default port
+EXPOSE 8080
+
+# Create/Set the working directory
+RUN mkdir /app
+WORKDIR /app
+
+COPY package.json /app/package.json
+RUN npm install
+
+# Copy App
+COPY . /app
+
+# Set Command
+CMD npm start
diff --git a/README.md b/README.md
@@ -2,6 +2,13 @@
 
 GraphQL server in Node.js using Express, MongoDB and Mongoose.
 
+## Running with Docker
+You can use `docker-compose up` to  run an instance of GraphQL-MongoDB Server and MongoDB locally.
+
+```bash
+docker-compose up
+```
+
 ## Requirements
 
 * [Node.js](http://nodejs.org/)
diff --git a/app.js b/app.js
@@ -9,11 +9,12 @@ var app = express();
 // GraphqQL server route
 app.use('/graphql', graphqlHTTP(req => ({
   schema,
-  pretty: true
+  pretty: true,
+  graphiql: true
 })));
 
 // Connect mongo database
-mongoose.connect('mongodb://localhost/graphql');
+mongoose.connect('mongodb://mongo/graphql');
 
 // start server
 var server = app.listen(8080, () => {
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '2'
+services:
+  web:
+    build:
+      context: .
+    links:
+      - mongo
+    ports:
+      - "8080:8080"
+    command: npm run start
+  mongo:
+    image: mongo

-Original file line number
+Diff line change
 /public/
 dist/
++
 +.idea