From 73d539142c3eba70e1a11e5bfda262e714f527e5 Mon Sep 17 00:00:00 2001 From: Shohei YOSHIDA Date: Fri, 2 Aug 2024 12:03:00 +0900 Subject: [PATCH 1/2] Update ruby version --- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- Gemfile.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cef86deb..a6ca07f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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' diff --git a/Dockerfile b/Dockerfile index 7e995824..e0bd430a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ## Dockerfile -FROM ruby:2.7 +FROM ruby:3.3 COPY Gemfile / diff --git a/Gemfile.lock b/Gemfile.lock index 148abd3d..10e77b9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 From b4158cca58dc646ae811dcfa82dad5625afd1d7f Mon Sep 17 00:00:00 2001 From: Shohei YOSHIDA Date: Fri, 2 Aug 2024 12:05:13 +0900 Subject: [PATCH 2/2] Update docker command --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5aab4be7..c82bc48b 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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)