Merge pull request #227 from UBC-DSCI/dev

Big dev -> master merge!

Author: trevorcampbell

01-reading.Rmd

@@ -3,9 +3,32 @@ This is the source for the Introduction to Data Science textbook.
 
 ## Setup and Build
 
-1. Install Docker (instructions here: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/))
+In order to build the book, you need to first install Docker 
+(instructions here: [https://docs.docker.com/get-docker/](https://docs.docker.com/get-docker/)).
+Then obtain the build image via
+```
+docker pull ubcdsci/intro-to-ds
+```
+From this point you have two options:
+
+- use whatever text editor you want, and build the book on the command line
+- use RStudio to both edit and build the book
+
+We provide instructions for both methods here.
+
+### Without RStudio
 
-2. Run RStudio inside the `ubcdsci/intro-to-ds` docker container:
+Once you are done editing, navigate to the repository root folder and run
+```
+./build.sh
+``` 
+from the command line. This command automatically spawns a docker container
+with the `ubcdsci/intro-to-ds` image, runs the script `build.R` from within the container,
+and then stops the container.
+
+### With RStudio
+
+1. Run RStudio inside the `ubcdsci/intro-to-ds` docker container:
     - in terminal, navigate to the root of this project repo
     - type the following in terminal:
 
@@ -17,7 +40,7 @@ This is the source for the Introduction to Data Science textbook.
 
     > Alternatively, you can type:
     > ```
-    > docker run --rm -it -p 8787:8787 -v $PWD:/home/rstudio/introduction-to-datascience -e PASSWORD=password ubcdsci/intro-to-ds:v0.1.0
+    > docker run --rm -it -p 8787:8787 -m 4g -v $PWD:/home/rstudio/introduction-to-datascience -e PASSWORD=password ubcdsci/intro-to-ds:v0.1.0
     > ```
     
     Next:
@@ -32,18 +55,6 @@ This is the source for the Introduction to Data Science textbook.
     bookdown::render_book('index.Rmd', 'bookdown::gitbook')
     ```
 
-> ### Usage without RStudio
-> You can use this docker container to edit the files without RStudio using either vim or emacs. This can be done via:
->
-> ```
-> docker-compose run --rm book-env bash
-> ```
-> 
-> or via:
-> ```
-> docker run --rm -it -v $PWD:/introduction-to-datascience ubcdsci/intro-to-ds /bin/bash
-> ```
-
 ### Updating the textbook data
 Data sets are collected and curated by `data/retrieve_data.ipynb`. To run that notebook in the Docker container type the following in the terminal:
 

02-wrangling.Rmd

@@ -3,3 +3,4 @@ language:
   ui:
     chapter_name: "Chapter "
 delete_merged_file: true
+rmd_files: ["index.Rmd", "intro.Rmd", "reading.Rmd", "wrangling.Rmd", "viz.Rmd", "classification1.Rmd", "classification2.Rmd", "regression1.Rmd", "regression2.Rmd", "clustering.Rmd", "inference.Rmd", "jupyter.Rmd", "version-control.Rmd", "setup.Rmd", "references.Rmd"]