use docker-compose for more reliable dev builds (#65)

Author: Jeff Knight

.circleci/config.yml

@@ -9,7 +9,6 @@ jobs:
       - run:
           name: Build static site
           command: |
-            
             ENV=development
             
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
@@ -19,7 +18,7 @@ jobs:
               ENV=staging
             fi;
             
-            JEKYLL_ENV=$ENV make docker-build
+            docker run --rm -e "JEKYLL_ENV=$ENV" -e "PLATFORM_API_TOKEN=$PLATFORM_API_TOKEN" --volume="$PWD:/srv/jekyll" -it jekyll/jekyll make build
 
       - run:
           name: Publish to Trebuchet

Makefile

@@ -3,14 +3,6 @@ BIN := ./node_modules/.bin
 # Core...
 JEKYLL_ENV ?= development
 
-DOCKER_TTY := docker run --rm \
-	-e "JEKYLL_ENV=$(JEKYLL_ENV)" \
-	-e "PLATFORM_API_TOKEN=$(PLATFORM_API_TOKEN)" \
-	-p 127.0.0.1:4000:4000/tcp \
-	--volume="$(PWD):/srv/jekyll" \
-	--volume="$(PWD)/vendor/bundle:/usr/local/bundle" \
-	-it jekyll/jekyll
-
 .PHONY: dev
 dev: node_modules vendor/bundle
 	@$(BIN)/concurrently --raw --kill-others -n webpack,jekyll \
@@ -64,14 +56,6 @@ node_modules: package.json yarn.lock
 vendor/bundle: Gemfile Gemfile.lock
 	bundle install
 
-.PHONY: docker-dev
-docker-dev:
-	$(DOCKER_TTY) make dev
-
-.PHONY: docker-build
-docker-build:
-	@$(DOCKER_TTY) make build
-
 #.PHONY: docs
 #docs: node_modules
 #	$(BIN)/webpack --mode=production

README.md

@@ -6,7 +6,7 @@ You can make a limited range of edits from the Github site, but this system work
 
 # Quickstart (local development with docker)
 You will need to have Docker installed https://docs.docker.com/install/
-* If using Linux, run `make docker-dev`
+* If using Linux, run `docker-compose up`
 * Visit http://localhost:4000/docsv2/
 
 # Local development with `ruby` and `node`, without platform-api

docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+  jekyll:
+    command: make dev
+    image: jekyll/jekyll:latest
+    volumes:
+      - '.:/srv/jekyll'
+      - './vendor/bundle:/usr/local/bundle'
+    ports:
+      - 4000:4000
+    container_name: jekyll