From 99d99b7e0120c8565263891949962c458f6d2124 Mon Sep 17 00:00:00 2001 From: raa0121 Date: Mon, 3 Nov 2025 20:37:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20docker=20compose=20=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _scripts/docker_jekyll | 14 +------------- _scripts/docker_jekyll_serve | 12 +----------- compose.yaml | 9 +++++++++ 3 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 compose.yaml diff --git a/_scripts/docker_jekyll b/_scripts/docker_jekyll index e5588939..60616dc2 100644 --- a/_scripts/docker_jekyll +++ b/_scripts/docker_jekyll @@ -10,16 +10,4 @@ set -eu -dir="$(pwd)" - -case $(uname -s) in - MSYS*) dir=$(cygpath -w $dir) ;; -esac - -docker run --rm -it \ - --workdir //srv/jekyll \ - -v "${dir}:/srv/jekyll" \ - -p 4000:4000 \ - --entrypoint "" \ - ghcr.io/actions/jekyll-build-pages:v1.0.13 \ - "$@" +docker compose run --rm jekyll "$@" diff --git a/_scripts/docker_jekyll_serve b/_scripts/docker_jekyll_serve index c2fe0658..3e577c8d 100644 --- a/_scripts/docker_jekyll_serve +++ b/_scripts/docker_jekyll_serve @@ -12,14 +12,4 @@ set -eu dir="$(pwd)" -case $(uname -s) in - MSYS*) dir=$(cygpath -w $dir) ;; -esac - -docker run --rm -it \ - --workdir //srv/jekyll \ - -v "${dir}:/srv/jekyll" \ - -p 4000:4000 \ - --entrypoint jekyll \ - ghcr.io/actions/jekyll-build-pages:v1.0.13 \ - server -H 0.0.0.0 "$@" +docker compose run -d --rm -p 4000:4000 jekyll jekyll server -H 0.0.0.0 "$@" diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..48936951 --- /dev/null +++ b/compose.yaml @@ -0,0 +1,9 @@ +services: + jekyll: + image: ghcr.io/actions/jekyll-build-pages:v1.0.13 + entrypoint: "" + working_dir: /srv/jekyll + volumes: + - .:/srv/jekyll + ports: + - "4000:4000" From 7091d6ff7b4a2e7119719b62f6d9b14e8548c89c Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 27 Nov 2025 10:02:22 +0900 Subject: [PATCH 2/3] Fixed the issues pointed out in the review - Exclude compose.yaml from output - Remove a variable "dir" that are no longer needed --- _config.yml | 1 + _scripts/docker_jekyll_serve | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 1028627e..cd4331bc 100644 --- a/_config.yml +++ b/_config.yml @@ -9,6 +9,7 @@ exclude: - 'README.md' - 'vendor' - 'eyecatch.rb' + - 'compose.yaml' include: - '.well-known' diff --git a/_scripts/docker_jekyll_serve b/_scripts/docker_jekyll_serve index 3e577c8d..3c52e623 100644 --- a/_scripts/docker_jekyll_serve +++ b/_scripts/docker_jekyll_serve @@ -10,6 +10,4 @@ set -eu -dir="$(pwd)" - docker compose run -d --rm -p 4000:4000 jekyll jekyll server -H 0.0.0.0 "$@" From eaa4114c2e73a24b9d41aa8e5978227780d1a685 Mon Sep 17 00:00:00 2001 From: MURAOKA Taro Date: Thu, 27 Nov 2025 10:18:55 +0900 Subject: [PATCH 3/3] Described how to stop the local HTTP server - Changed how to stop the local HTTP server - Documented how to completely cleanup --- README.md | 4 ++++ _scripts/docker_jekyll_serve | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index db36e819..c152905f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,10 @@ $ ./_scripts/docker_jekyll_serve これは4000番のポートでコンテンツを供給する。 Webブラウザで を開くことで内容を確認できる。 +ローカルHTTPサーバーを停止するには Ctrl-C でプロセス自体を停止する。 +内部で docker の専用ネットワークが作成されているため、 +それも削除するにはサーバーを停止した後で `docker compose down` を実行する。 + また以下のように同コマンドへオプションを指定すると、インクリメンタルビルドと 変更監視&自動再ビルド機能が有効になる。 diff --git a/_scripts/docker_jekyll_serve b/_scripts/docker_jekyll_serve index 3c52e623..482b0912 100644 --- a/_scripts/docker_jekyll_serve +++ b/_scripts/docker_jekyll_serve @@ -10,4 +10,4 @@ set -eu -docker compose run -d --rm -p 4000:4000 jekyll jekyll server -H 0.0.0.0 "$@" +docker compose run --rm -p 4000:4000 jekyll jekyll server -H 0.0.0.0 "$@"