🛠 Use podman/docker for build
This commit is contained in:
parent
aed3ab9966
commit
05f711fa7d
1 changed files with 11 additions and 5 deletions
16
Makefile
16
Makefile
|
|
@ -4,23 +4,29 @@ export PATH := $(HOME)/bin:$(PATH):/usr/local/bin
|
||||||
PORT ?= 4000
|
PORT ?= 4000
|
||||||
IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.1
|
IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.1
|
||||||
|
|
||||||
|
ifeq ($(shell command -v podman 2> /dev/null),)
|
||||||
|
CMD=docker
|
||||||
|
else
|
||||||
|
CMD=podman
|
||||||
|
endif
|
||||||
|
|
||||||
all: serve
|
all: serve
|
||||||
|
|
||||||
Gemfile.lock:
|
Gemfile.lock:
|
||||||
docker run --rm -v $(shell pwd):/app -w /app ruby:2.7 sh -c 'gem install bundler:2.0.2 && bundle install'
|
$(CMD) run --rm -v $(shell pwd):/app -w /app ruby:2.7 sh -c 'gem install bundler:2.0.2 && bundle install'
|
||||||
|
|
||||||
.image: Dockerfile Gemfile.lock
|
.image: Dockerfile Gemfile.lock
|
||||||
docker build -t $(IMAGE) .
|
$(CMD) build -t $(IMAGE) .
|
||||||
docker image inspect $(IMAGE) | jq -r '.[0].Id' | tee .image
|
$(CMD) image inspect $(IMAGE) | jq -r '.[0].Id' | tee .image
|
||||||
|
|
||||||
_config.local.yml:
|
_config.local.yml:
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
_site/index.html: .image _config.local.yml index.html
|
_site/index.html: .image _config.local.yml index.html
|
||||||
docker run --rm -v $(shell pwd):/app:rw -w /app $(IMAGE) bundle exec jekyll build -c '_config.yml,_config.local.yml'
|
$(CMD) run --rm -v $(shell pwd):/app:rw -w /app $(IMAGE) bundle exec jekyll build -c '_config.yml,_config.local.yml'
|
||||||
|
|
||||||
serve: _site/index.html
|
serve: _site/index.html
|
||||||
docker run --rm -it -v $(shell pwd):/app -w /app -p $(PORT):$(PORT) $(IMAGE) bundle exec jekyll serve -H 0.0.0.0 -P "$(PORT)" -c '_config.yml,_config.local.yml'
|
$(CMD) run --rm -it -v $(shell pwd):/app -w /app -p $(PORT):$(PORT) $(IMAGE) bundle exec jekyll serve -H 0.0.0.0 -P "$(PORT)" -c '_config.yml,_config.local.yml'
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf _site
|
rm -rf _site
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue