Skip to content

Update ruby version in Dockerfile #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Update ruby version in Dockerfile #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73d5391
Update ruby version
syohex Aug 2, 2024
b4158cc
Update docker command
syohex Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Build site
run: 'make build'
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Dockerfile

FROM ruby:2.7
FROM ruby:3.3

COPY Gemfile /

Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ GEM
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.3)
strscan
rouge (3.26.0)
ruby-enum (0.9.0)
i18n
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PORT ?= 4000
all: up

$(DOCKERLOCK):
PORT=${PORT} docker-compose up -d
PORT=${PORT} docker compose up -d
touch $@

.PHONY: up serve
Expand All @@ -20,14 +20,14 @@ serve: $(DOCKERLOCK)

.PHONY: log
log: $(DOCKERLOCK)
docker-compose logs -f
docker compose logs -f

# -T option from https://github.com/docker/compose/issues/7306
.PHONY: build
build: $(DOCKERLOCK)
docker-compose exec -T main jekyll build --trace
docker compose exec -T main jekyll build --trace

.PHONY: down
down:
docker-compose down
docker compose down
rm -rf $(DOCKERLOCK)