Fixes bugs in setup and Dockerfile, updates README

rovercode · Nov 17, 2016 · 811ee34 · 811ee34
1 parent d369650
commit 811ee34
Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stable
 MAINTAINER Clifton Barnes <clifton.a.barnes@gmail.com>
 
 RUN apt-get update
-RUN apt-get install -y python python-dev python-pip python-smbus nginx build-essential libssl-dev
+RUN apt-get install -y python python-dev python-pip python-smbus nginx build-essential git libssl-dev
 RUN pip install flask flask-socketio gevent uwsgi
 
 EXPOSE 80
@@ -17,7 +17,7 @@ RUN rm -f default
 WORKDIR /var/www/rovercode/www/Adafruit_Python_GPIO
 RUN python setup.py install
 WORKDIR /var/www/rovercode
-RUN git clone https://github.com/unbit/uwsgi.git
+RUN git clone -b uwsgi-2.0 https://github.com/unbit/uwsgi.git
 WORKDIR /var/www/rovercode/uwsgi
 RUN python uwsgiconfig.py --build core
 RUN python uwsgiconfig.py --plugin plugins/python core

diff --git a/README.md b/README.md
@@ -12,15 +12,37 @@ rovercode runs on any single-board-computer supported by the [Adafruit Python GP
 
 [Try a live demo.](http://codetherover.com/demo/rover-code/www/mission-control.html)
 
-## Easy Setup
-First, on your robot:
+## Setup
+### Standard Setup
+First, on your rover (CHIP, Raspberry Pi, BeagleBone, etc):
 ```bash
+$ sudo apt install git
 $ git clone --recursive https://github.com/aninternetof/rovercode.git && cd rovercode
-$ sudo ./setup.sh #run this only once
+$ sudo ./setup.sh #run this only once -- it will take some time
 $ sudo ./start.sh #run this each time you boot the rover
 ```
 Then, on your PC or tablet, point your browser to your robot's IP address.
 
+### Development PC Setup
+First, on your development PC:
+```bash
+$ sudo apt install git
+$ git clone --recursive https://github.com/aninternetof/rovercode.git && cd rovercode
+$ sudo ./setup.sh #run this only once -- it will take some time
+$ sudo ./start.sh #run this each time you want to work on rovercode
+```
+Then, on your PC, point your browser to `localhost`.
+
+### Development PC Alternate Setup (Docker)
+```bash
+$ sudo apt install git docker.io
+$ git clone --recursive https://github.com/aninternetof/rovercode.git && cd rovercode
+$ sudo docker build -t rovercode ./ #run this only once -- it will take some time
+$ sudo docker run -p 80:80 rovercode #run this each time you want to work on rovercode
+
+```
+Then, on your PC, point your browser to `localhost`.
+
 ## Install, Play and Contribute
 rovercode is on its first release. It is usable now, but we have lots of great features left to be added. Check out the [install instructions](https://github.com/aninternetof/rovercode/wiki/Getting-Set-Up) and the [contributing instructions](https://github.com/aninternetof/rovercode/wiki/Contributing). Check out the [feature tracker](https://huboard.com/aninternetof/rovercode) to see if there's something fun to contribute.
 

diff --git a/setup.sh b/setup.sh
@@ -14,14 +14,14 @@ if [ ! -e ${ADAFRUIT_DIR} ]; then
 	exit 2
 fi
 
-apt-get install -y python python-dev python-pip python-smbus nginx build-essential libssl-dev
+apt-get install -y python python-dev python-pip python-smbus nginx build-essential git libssl-dev
 pip install flask flask-socketio gevent uwsgi
 
 pushd ${ADAFRUIT_DIR} > /dev/null
 python setup.py install
 popd > /dev/null
 
-git clone https://github.com/unbit/uwsgi.git
+git clone -b uwsgi-2.0 https://github.com/unbit/uwsgi.git
 pushd ${UWSGI_DIR} > /dev/null
 python uwsgiconfig.py --build core
 python uwsgiconfig.py --plugin plugins/python core