From d3fdd6244378e15957613b3cb29df910ff2a67a6 Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Sat, 30 Nov 2024 20:19:57 +0000 Subject: [PATCH 1/5] FIX devcontainer for git Signed-off-by: Shunsuke Kimura --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ff9cca255f..0933c79502 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -7,5 +7,6 @@ "forwardPorts": [3000], "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached", "workspaceFolder": "/workspace", - "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && npx serve -n ./dist" + "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && npx serve -n ./dist", + "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}" } From d2c9de23863b18aa97d88fcd86e0efddc2ec3ca4 Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Sun, 1 Dec 2024 15:27:16 +0900 Subject: [PATCH 2/5] Remove serve Signed-off-by: Shunsuke Kimura --- .devcontainer/Dockerfile | 17 +++++++---------- .devcontainer/devcontainer.json | 3 +-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 97f48610e8..6d1ed5936d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,20 +1,17 @@ # Rust v1.77 as a base image FROM rust:1.77-slim -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - git openssh-client \ - curl \ - # install python3, jinja2 pyyaml - python3 \ - python3-pip \ +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + git \ + openssh-client \ + python3 \ + python3-pip \ && python3 -m pip install --break-system-packages jinja2 PyYAML \ - # install nodejs and serve && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ && apt-get install -y nodejs \ - && npm install -g serve@14.2.3 \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* WORKDIR /workspace ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0933c79502..5bd8fc5851 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,9 +4,8 @@ "dockerfile": "Dockerfile", "context": ".." }, - "forwardPorts": [3000], "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached", "workspaceFolder": "/workspace", - "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && npx serve -n ./dist", + "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && python3 -m http.server -d dist", "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}" } From 8c991251460c5dbf527da6bfea7f09d5f46e334a Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Sun, 1 Dec 2024 07:41:56 +0000 Subject: [PATCH 3/5] Remove Nodejs Signed-off-by: Shunsuke Kimura --- .devcontainer/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6d1ed5936d..00acbabf8d 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -8,8 +8,6 @@ RUN apt-get update \ python3 \ python3-pip \ && python3 -m pip install --break-system-packages jinja2 PyYAML \ - && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y nodejs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 2a0189b0d6939f7309f5ff78f046e442655385bd Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Sun, 1 Dec 2024 07:46:45 +0000 Subject: [PATCH 4/5] ADD vscode user in docker Signed-off-by: Shunsuke Kimura --- .devcontainer/Dockerfile | 11 +++++++++-- .devcontainer/devcontainer.json | 1 + .vscode/tasks.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 00acbabf8d..7d5c2bf5b5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,13 @@ -# Rust v1.77 as a base image FROM rust:1.77-slim -RUN apt-get update \ +ARG USERNAME=vscode +ARG USER_UID=1000 +ARG USER_GID=$USER_UID + +RUN groupadd --gid $USER_GID $USERNAME \ + && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \ + && chsh -s /bin/bash $USERNAME \ + && apt-get update \ && apt-get install -y --no-install-recommends \ git \ openssh-client \ @@ -13,3 +19,4 @@ RUN apt-get update \ WORKDIR /workspace ENV PATH="/root/.cargo/bin:${PATH}" +USER $USERNAME diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5bd8fc5851..522c5f469d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,6 +4,7 @@ "dockerfile": "Dockerfile", "context": ".." }, + "remoteUser": "vscode", "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached", "workspaceFolder": "/workspace", "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && python3 -m http.server -d dist", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b288b27fef..5fee371636 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "gen: typst-jp documentation", "type": "shell", - "command": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && echo reload or open http://localhost:3000", + "command": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && echo reload or open http://localhost:8000", "problemMatcher": [] } ] From 43056f2f1ade0f493dc7c52fa0ce45964f94da53 Mon Sep 17 00:00:00 2001 From: Shunsuke Kimura Date: Wed, 11 Dec 2024 20:22:09 +0000 Subject: [PATCH 5/5] MOD rename vscode to typst-jp Signed-off-by: Shunsuke Kimura --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7d5c2bf5b5..9168e9d157 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ FROM rust:1.77-slim -ARG USERNAME=vscode +ARG USERNAME=typst-jp ARG USER_UID=1000 ARG USER_GID=$USER_UID diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 522c5f469d..a0e89a7183 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "dockerfile": "Dockerfile", "context": ".." }, - "remoteUser": "vscode", + "remoteUser": "typst-jp", "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached", "workspaceFolder": "/workspace", "postStartCommand": "cargo test --package typst-docs --lib -- tests::test_docs --exact --nocapture && python3 ./gen.py && python3 -m http.server -d dist",