dan/danielrayjones
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

⬆️ Upgrade ruby to 2.7

Browse source
This commit is contained in:
Dan Jones 2023-03-29 14:40:35 -05:00
commit 1c009c8f6b
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -5,7 +5,7 @@ jobs:
only: [master] only: [master]
working_directory: /tmp/danielrayjones working_directory: /tmp/danielrayjones
docker: docker:
- image: ruby:2.6.3 - image: ruby:2.7
steps: steps:
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ruby:2.6.3 FROM ruby:2.7
RUN gem install bundler:2.0.2 && \ RUN gem install bundler:2.0.2 && \
bundle config --global frozen 1 bundle config --global frozen 1

14
Makefile
View file

@ -2,25 +2,25 @@
export PATH := $(HOME)/bin:$(PATH):/usr/local/bin export PATH := $(HOME)/bin:$(PATH):/usr/local/bin
PORT ?= 4000 PORT ?= 4000
IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.0 IMAGE=danjones000/danielrayjones/ruby-with-bundler:1.0.1
all: serve all: serve
Gemfile.lock: 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 .image: Dockerfile Gemfile.lock
podman build -t $(IMAGE) . docker build -t $(IMAGE) .
podman image inspect $(IMAGE) | jq -r '.[0].Id' | tee .image docker 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
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 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: clean:
rm -rf _site rm -rf _site