Merge pull request #38 from SpringRoll/feature/159931672-run-dev-app-local

remove app from docker, modify .env

Author: chipbell4

.gitignore

@@ -3,3 +3,4 @@ node_modules
 .env
 springroll.log
 log.txt
+app/output.log

Dockerfile

@@ -11,9 +11,12 @@ SpringRoll Connect is a content management system built using [NodeJS](https://n
 
 * Install the latest version of [Docker](https://www.docker.com/)
 * Copy `sample.env` to `.env`. You can modify these values, but for development you shouldn't have to
-* Run `docker-compose up --build` which should build both the mongo db server and start the node service
-* The website should then be available at `localhost:3000`
-* You can then seed the database with some information by running `node seed.js`
+* Run `docker-compose up --build` which should build both the mongo db server
+* Run `node server.js` which should start the application server
+* You should then seed the database with some information by running `node seed.js`
+* Running `seed.js` will also output the password for a user `admin`
+* The website should then be available at `localhost:3000`, and you can log in with your admin credentials from the `seed.js` output
+
 
 ## License
 

README.md

@@ -7,12 +7,4 @@ services:
             - "27017"
         ports:
             - "27017:27017"
-    app:
-        build: ./
-        depends_on:
-            - db
-        env_file:
-            - .env
-        ports:
-            - "3000:3000"
 

docker-compose.yml

@@ -1,5 +1,5 @@
 env=development
 PORT=3000
-MONGO_DATABASE=mongodb://db:27017/connect
+MONGO_DATABASE=mongodb://localhost:27017/connect
 SECRET_KEY=springrollconnect
-OUTPUT_LOG=/output.log
+OUTPUT_LOG=./output.log