whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update json gem and use bundler

Browse Source 
- json 1.8.3 was failing to install on Mac. Upgrading has fixed this.
- Call jekyll through bundler so that Gemfile versions
This commit is contained in:
Rob Young
2017-08-25 12:33:14 +01:00
parent 44f3acad1e
commit 07931517e3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+2 -2
View File
@@ -155,7 +155,7 @@ GEM
gemoji (~> 2.0) gemoji (~> 2.0)
html-pipeline (~> 2.2) html-pipeline (~> 2.2)
jekyll (>= 3.0) jekyll (>= 3.0)
json (1.8.3) json (1.8.6)
kramdown (1.11.1) kramdown (1.11.1)
liquid (3.0.6) liquid (3.0.6)
listen (3.0.6) listen (3.0.6)
@@ -200,4 +200,4 @@ DEPENDENCIES
jekyll-include-cache (~> 0.1) jekyll-include-cache (~> 0.1)
BUNDLED WITH BUNDLED WITH
1.13.6 1.15.2
Makefile
+3 -3
View File
@@ -6,13 +6,13 @@ help: ## Show this help.
all: build ## Build site with production settings and put deliverables in _site. all: build ## Build site with production settings and put deliverables in _site.
build: ## Build site with production settings and put deliverables in _site. build: ## Build site with production settings and put deliverables in _site.
jekyll build bundle exec jekyll build
build-preview: ## Build site with drafts and future posts enabled. build-preview: ## Build site with drafts and future posts enabled.
jekyll build --drafts --future bundle exec jekyll build --drafts --future
serve: ## Boot the development server. serve: ## Boot the development server.
jekyll serve bundle exec jekyll serve
stage: ## Run the Jekyll staging container. stage: ## Run the Jekyll staging container.
docker run -ti --rm -v "${PWD}":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1 docker run -ti --rm -v "${PWD}":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.1