Skip to content

Commit 9d0e9c9

Browse files
committed
Node v24 for devcontainer
1 parent 0b2c938 commit 9d0e9c9

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
matrix:
2424
include:
2525
- image_name: vscode-devcontainer
26-
image_tag: api
27-
filter_ref: gh-devcontainer
28-
dockerfile_path: vscode-devcontainer/api/
26+
image_tag: 202512
27+
filter_ref: gh-devcontainer-202512
28+
dockerfile_path: vscode-devcontainer/versions/go1.25-node24/
2929
platforms: linux/amd64,linux/arm64
3030
- image_name: shellcheck
3131
image_tag: 0.7

vscode-devcontainer/api/Dockerfile renamed to vscode-devcontainer/versions/go1.25-node24/Dockerfile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ ENV AIR_VERSION=v1.63.4 \
2626
OAPI_VERSION=v2.5.1 \
2727
GOLANGCI_LINT_VERSION=v2.7.1
2828

29-
# キャッシュマウントを使用して高速化
3029
RUN --mount=type=cache,target=/go/pkg/mod \
3130
--mount=type=cache,target=/root/.cache/go-build \
3231
go install github.com/air-verse/air@${AIR_VERSION} && \
@@ -97,18 +96,14 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh
9796
ENV PATH=/root/.local/bin:$PATH
9897

9998
# ------------------------------------------------------------------------------
100-
# Node.js Tools (Gemini, MCP など)
99+
# Node.js Tools (pnpm, rulesync など)
101100
# ------------------------------------------------------------------------------
102-
ENV GOOGLE_CLOUD_LOCATION=global \
103-
GOOGLE_GENAI_USE_VERTEXAI=true \
104-
GEMINI_MODEL="gemini-2.5-flash"
105-
106-
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
101+
RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \
107102
&& apt-get install -y nodejs
108103

109104
RUN --mount=type=cache,target=/root/.npm \
110105
npm install -g npm@latest --force && \
111-
npm install -g @google/gemini-cli && \
106+
npm install -g pnpm && \
112107
npm install -g rulesync && \
113108
npm install -g @upstash/context7-mcp
114109

@@ -136,14 +131,21 @@ ENV CLAUDE_CODE_USE_BEDROCK=false \
136131
ANTHROPIC_MODEL=claude-sonnet-4-5-20250929 \
137132
ANTHROPIC_SMALL_FAST_MODEL=claude-haiku-4-5-20251001
138133

134+
# ------------------------------------------------------------------------------
135+
# Gemini
136+
# ------------------------------------------------------------------------------
137+
ENV GOOGLE_CLOUD_LOCATION=global \
138+
GOOGLE_GENAI_USE_VERTEXAI=true \
139+
GEMINI_MODEL="gemini-2.5-flash"
140+
RUN npm install -g @google/gemini-cli
141+
139142
# ------------------------------------------------------------------------------
140143
# Go
141144
# ------------------------------------------------------------------------------
142145
COPY --from=go-builder /usr/local/go /usr/local/go
143146
ENV PATH=$PATH:/usr/local/go/bin:/go/bin
144147
ENV GOPATH=/go
145148

146-
# ツールのコピー
147149
COPY --from=go-builder /go/bin /go/bin
148150

149151
ENV CGO_ENABLED=0 \

0 commit comments

Comments
 (0)