From aef4aeb132051f0043bdb1250549f56c8591541f Mon Sep 17 00:00:00 2001 From: Bryan Mikaelian Date: Fri, 26 Jul 2019 14:43:13 -0400 Subject: [PATCH 1/2] Better make scripts --- Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f3736013f1..9973d4da08 100644 --- a/Makefile +++ b/Makefile @@ -5,13 +5,18 @@ docs: echo "Running segment docs at http://localhost:4000/docsv2/" && \ docker run -p 4000:80 segment-docs:latest +.PHONY: env +env: + gem install bundler && \ + bundle install + +.PHONY: clean +clean: + bundle exec jekyll clean .PHONY: deps deps: - docker run -it \ - --volume="$(PWD):/srv/jekyll" \ - jekyll/jekyll \ - bundle install + bundle install .PHONY: build build: @@ -24,8 +29,5 @@ build: .PHONY: dev dev: - docker run -it \ - -p 4000:4000 \ - --volume="$(PWD):/srv/jekyll" \ - jekyll/jekyll \ - jekyll serve -H 0.0.0.0 \ No newline at end of file + make clean && \ + bundle exec jekyll serve --incremental -H 0.0.0.0 \ No newline at end of file From 37115f65fbdc0c8ba8f77ae6b0f6f6b8b8dc767e Mon Sep 17 00:00:00 2001 From: Bryan Mikaelian Date: Fri, 26 Jul 2019 15:06:47 -0400 Subject: [PATCH 2/2] Keep old docker-based scripts --- Makefile | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9973d4da08..d36c207bb9 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,53 @@ docs: echo "Running segment docs at http://localhost:4000/docsv2/" && \ docker run -p 4000:80 segment-docs:latest + +.PHONY: build +build: + docker run -it \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + bundle package && \ + bundle install && \ + bundle exec jekyll build + +.PHONY: nav +nav: + docker run -it \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + rake nav:update + +.PHONY: catalog +catalog: + docker run -it \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + rake catalog:update + +.PHONY: docker-clean +docker-clean: + docker run -it \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + jekyll clean + +.PHONY: docker-deps +docker-deps: + docker run -it \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + bundle install + +.PHONY: docker-dev +docker-dev: + docker run -it \ + -p 4000:4000 \ + --volume="$(PWD):/srv/jekyll" \ + jekyll/jekyll \ + jekyll serve --incremental -H 0.0.0.0 + .PHONY: docs + .PHONY: env env: gem install bundler && \ @@ -18,15 +65,6 @@ clean: deps: bundle install -.PHONY: build -build: - docker run -it \ - --volume="$(PWD):/srv/jekyll" \ - jekyll/jekyll \ - bundle package && \ - bundle install && \ - bundle exec jekyll build - .PHONY: dev dev: make clean && \