From ae895dd1cf2e3bd42c3c8c58ae89f962b64e9eb8 Mon Sep 17 00:00:00 2001 From: jamescochran Date: Fri, 29 Dec 2017 22:51:51 -0500 Subject: [PATCH 1/3] Update Running_the_App.md (#306) Fixed a type --- docs/Running_the_App.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Running_the_App.md b/docs/Running_the_App.md index 6bf72619..bf5373b7 100644 --- a/docs/Running_the_App.md +++ b/docs/Running_the_App.md @@ -1,6 +1,6 @@ # Running the App -The recommended way to run this app is with docker. You can install docker [here](https://www.docker.com/products/overview). If you are not familiar with docker you can read more about it on [there website](https://www.docker.com/what-docker). +The recommended way to run this app is with docker. You can install docker [here](https://www.docker.com/products/overview). If you are not familiar with docker you can read more about it on [their website](https://www.docker.com/what-docker). If you are looking to run the app without docker, see the instructions [here](Running_without_Docker.md) From 68bad05dc3a87ecf71034007cf976255954cf694 Mon Sep 17 00:00:00 2001 From: Daniel Widrick Date: Tue, 9 Jan 2018 14:28:05 -0500 Subject: [PATCH 2/3] Fix typo in dev instructions (#309) File Names in Linux are case sensitive. Fixed typo to correlate to cloned git repository directory name. --- docs/Running_the_App.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Running_the_App.md b/docs/Running_the_App.md index bf5373b7..96a7894f 100644 --- a/docs/Running_the_App.md +++ b/docs/Running_the_App.md @@ -32,7 +32,7 @@ docker-compose -f docker-prod.yml up -d ### Running the app with docker for development ```bash git clone https://github.com/RyanNoelk/OpenEats.git -cd openeats +cd OpenEats git checkout dev docker-compose build docker-compose up -d From d35a9659602a62e158e96354eae7825220f3d5a4 Mon Sep 17 00:00:00 2001 From: Ryan Noelk Date: Wed, 10 Jan 2018 10:49:41 -0500 Subject: [PATCH 3/3] adding correct docker-compose yml file to docs (#310) --- docs/Running_the_App.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Running_the_App.md b/docs/Running_the_App.md index 96a7894f..9fb04991 100644 --- a/docs/Running_the_App.md +++ b/docs/Running_the_App.md @@ -44,7 +44,7 @@ Regardless of if your running the app in production or development, you need to To create a super user: ``` bash -docker-compose run --rm --entrypoint 'python manage.py createsuperuser' api +docker-compose -f docker-prod.yml run --rm --entrypoint 'python manage.py createsuperuser' api ``` Follow the prompts given to create your user. You can do this as many times as you like.