Skip to content

Commit 44c3067

Browse files
author
Jeff Knight
committed
fixing vendor/bundle caching issues
1 parent fafdb89 commit 44c3067

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.bundle/config

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
BUNDLE_PATH: "vendor/bundle"

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ _site
22
.sass-cache
33
.jekyll-metadata
44
vendor
5-
.bundle
65
.DS_Store
76
.env
87
.jekyll-cache

Makefile

+11-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ BIN := ./node_modules/.bin
22

33
# Core...
44
JEKYLL_ENV ?= development
5-
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" -it jekyll/jekyll
5+
6+
DOCKER_TTY := docker run --rm \
7+
-e "JEKYLL_ENV=$(JEKYLL_ENV)" \
8+
-e "PLATFORM_API_TOKEN=$(PLATFORM_API_TOKEN)" \
9+
-p 127.0.0.1:4000:4000/tcp \
10+
--volume="$(PWD):/srv/jekyll" \
11+
--volume="$(PWD)/vendor/bundle:/usr/local/bundle" \
12+
-it jekyll/jekyll
613

714
.PHONY: dev
815
dev: node_modules vendor/bundle
@@ -43,18 +50,19 @@ clean:
4350
clean-deps:
4451
@rm -Rf vendor
4552
@rm -Rf node_modules
46-
@rm -Rf .bundle
4753

4854
.PHONY: seed
4955
seed:
5056
@cp templates/destinations.example.yml src/_data/catalog/destinations.yml
5157
@cp templates/sources.example.yml src/_data/catalog/sources.yml
5258

59+
.PHONY: node_modules
5360
node_modules: package.json yarn.lock
5461
yarn --frozen-lockfile
5562

63+
.PHONY: vendor/bundle
5664
vendor/bundle: Gemfile Gemfile.lock
57-
bundle install --path vendor/bundle
65+
bundle install
5866

5967
.PHONY: docker-dev
6068
docker-dev:

0 commit comments

Comments
 (0)