From 116d5b92846b72eb74af032846ad08a7f5616c15 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Michonneau?= <francois.michonneau@gmail.com>
Date: Wed, 11 Dec 2019 15:06:25 -0500
Subject: [PATCH] refactor use of docker

Co-authored-by: Allen Lee <allen.lee@asu.edu>
---
 .gitignore                   |  1 +
 Makefile                     |  7 +++++--
 bin/boilerplate/_config.yml  |  1 +
 bin/run-make-docker-serve.sh | 10 ++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100755 bin/run-make-docker-serve.sh

diff --git a/.gitignore b/.gitignore
index 2f3299e..1aec1b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ _site
 .Rhistory
 .RData
 .vendor/
+.docker-vendor/
 Gemfile.lock
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 124e397..1fdc5d2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
 JEKYLL_VERSION=3.8.5
-JEKYLL_DOCKER=${JEKYLL} serve --host 0.0.0.0
 JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
 PARSER=bin/markdown_ast.rb
 DST=_site
@@ -44,7 +43,11 @@ commands :
 
 ## docker-serve     : use docker to build the site
 docker-serve :
-	docker run --rm -it -v ${PWD}:/srv/jekyll -p 4000:4000 jekyll/jekyll:${JEKYLL_VERSION} ${JEKYLL_DOCKER}
+	docker run --rm -it --volume ${PWD}:/srv/jekyll \
+           --volume=${PWD}/.docker-vendor/bundle:/usr/local/bundle \
+           -p 127.0.0.1:4000:4000 \
+           jekyll/jekyll:${JEKYLL_VERSION} \
+           bin/run-make-docker-serve.sh
 
 ## serve            : run a local server.
 serve : lesson-md
diff --git a/bin/boilerplate/_config.yml b/bin/boilerplate/_config.yml
index a1b32fe..f5067e5 100644
--- a/bin/boilerplate/_config.yml
+++ b/bin/boilerplate/_config.yml
@@ -92,6 +92,7 @@ exclude:
   - bin/
   - .Rproj.user/
   - .vendor/
+  - .docker-vendor/
 
 # Turn on built-in syntax highlighting.
 highlighter: rouge
diff --git a/bin/run-make-docker-serve.sh b/bin/run-make-docker-serve.sh
new file mode 100755
index 0000000..1e09178
--- /dev/null
+++ b/bin/run-make-docker-serve.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+
+bundle install
+bundle update
+exec bundle exec jekyll serve --host 0.0.0.0
-- 
2.30.2