⬆️ Upgrade ruby to 2.7
This commit is contained in:
parent
5aec56ff05
commit
1c009c8f6b
3 changed files with 9 additions and 9 deletions
|
|
@ -5,7 +5,7 @@ jobs:
|
|||
only: [master]
|
||||
working_directory: /tmp/danielrayjones
|
||||
docker:
|
||||
- image: ruby:2.6.3
|
||||
- image: ruby:2.7
|
||||
steps:
|
||||
- add_ssh_keys:
|
||||
fingerprints:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM ruby:2.6.3
|
||||
FROM ruby:2.7
|
||||
|
||||
RUN gem install bundler:2.0.2 && \
|
||||
bundle config --global frozen 1
|
||||
|
|
|
|||
14
Makefile
14
Makefile
|
|
@ -2,25 +2,25 @@
|
|||
|
||||
export PATH := $(HOME)/bin:$(PATH):/usr/local/bin
|
||||
PORT ?= 4000
|
||||
IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.0
|
||||
IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.1
|
||||
|
||||
all: serve
|
||||
|
||||
Gemfile.lock:
|
||||
podman run --rm -v $(shell pwd):/app -w /app ruby:2.6.3 sh -c 'gem install bundler:2.0.2 && bundle install'
|
||||
docker run --rm -v $(shell pwd):/app -w /app ruby:2.7 sh -c 'gem install bundler:2.0.2 && bundle install'
|
||||
|
||||
.image: Gemfile.lock
|
||||
podman build -t $(IMAGE) .
|
||||
podman image inspect $(IMAGE) | jq -r '.[0].Id' | tee .image
|
||||
.image: Dockerfile Gemfile.lock
|
||||
docker build -t $(IMAGE) .
|
||||
docker image inspect $(IMAGE) | jq -r '.[0].Id' | tee .image
|
||||
|
||||
_config.local.yml:
|
||||
touch $@
|
||||
|
||||
_site/index.html: .image _config.local.yml index.html
|
||||
podman run --rm -v $(shell pwd):/app:rw -w /app $(IMAGE) bundle exec jekyll build -c '_config.yml,_config.local.yml'
|
||||
docker run --rm -v $(shell pwd):/app:rw -w /app $(IMAGE) bundle exec jekyll build -c '_config.yml,_config.local.yml'
|
||||
|
||||
serve: _site/index.html
|
||||
podman 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'
|
||||
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'
|
||||
|
||||
clean:
|
||||
rm -rf _site
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue