Skip to content

Commit 3c4d6de

Browse files
committed
updated vscode devcontainer
1 parent cd26baa commit 3c4d6de

2 files changed

Lines changed: 31 additions & 8 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: 202512
27-
filter_ref: gh-devcontainer-202512
28-
dockerfile_path: vscode-devcontainer/versions/go1.25-node24/
26+
image_tag: 20251218
27+
filter_ref: gh-devcontainer
28+
dockerfile_path: vscode-devcontainer/versions/go1.25-node25/
2929
platforms: linux/amd64,linux/arm64
3030
- image_name: shellcheck
3131
image_tag: 0.7

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

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ ENV CGO_ENABLED=0 \
2121
GOARCH=${TARGETARCH}
2222

2323
ENV AIR_VERSION=v1.63.4 \
24-
DELVE_VERSION=v1.25.2 \
24+
DELVE_VERSION=v1.26.0 \
2525
MOCKGEN_VERSION=v0.6.0 \
2626
BUF_VERSION=v1.61.0 \
2727
PROTOC_GEN_GO_VERSION=v1.36.10 \
28+
PROTOC_GEN_GO_GRPC_VERSION=v1.6.0 \
2829
PROTOC_GEN_CONNECT_GO_VERSION=v1.19.1 \
30+
GRPC_GATEWAY_VERSION=v2.27.4 \
2931
OAPI_VERSION=v2.5.1 \
3032
GOLANGCI_LINT_VERSION=v2.7.2
3133

@@ -36,7 +38,10 @@ RUN --mount=type=cache,target=/go/pkg/mod \
3638
go install go.uber.org/mock/mockgen@${MOCKGEN_VERSION} && \
3739
go install github.com/bufbuild/buf/cmd/buf@${BUF_VERSION} && \
3840
go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VERSION} && \
41+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@${PROTOC_GEN_GO_GRPC_VERSION} && \
3942
go install connectrpc.com/connect/cmd/protoc-gen-connect-go@${PROTOC_GEN_CONNECT_GO_VERSION} && \
43+
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@${GRPC_GATEWAY_VERSION} && \
44+
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@${GRPC_GATEWAY_VERSION} && \
4045
go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@${OAPI_VERSION} && \
4146
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION} && \
4247
if [ -d "/go/bin/linux_${TARGETARCH}" ]; then \
@@ -69,6 +74,7 @@ RUN --mount=type=cache,target=/var/cache/apt/archives,id=apt-archives-${TARGETAR
6974
python3-pip \
7075
protobuf-compiler \
7176
libprotobuf-dev \
77+
gnupg lsb-release \
7278
locales \
7379
&& localedef -f UTF-8 -i ja_JP ja_JP.UTF-8 \
7480
&& rm -rf /var/lib/apt/lists/*
@@ -104,9 +110,9 @@ ENV PATH=/root/.local/bin:$PATH
104110
# Node.js Tools (pnpm, rulesync など)
105111
# ------------------------------------------------------------------------------
106112
ENV NPM_VERSION=11.7.0 \
107-
PNPM_VERSION=10.26.0 \
108-
RULESYNC_VERSION=3.34.0 \
109-
CONTEXT7_VERSION=1.0.33
113+
PNPM_VERSION=10.26.2 \
114+
RULESYNC_VERSION=4.3.1 \
115+
CONTEXT7_VERSION=2.0.0
110116

111117
RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \
112118
&& apt-get install -y nodejs
@@ -118,6 +124,23 @@ RUN --mount=type=cache,target=/root/.npm \
118124
npm install -g "@upstash/context7-mcp@${CONTEXT7_VERSION}" && \
119125
npm cache clean --force
120126

127+
# ------------------------------------------------------------------------------
128+
# Docker
129+
# ------------------------------------------------------------------------------
130+
RUN for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do apt-get remove -y $pkg; done \
131+
&& apt autoremove -y
132+
RUN install -m 0755 -d /etc/apt/keyrings \
133+
&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
134+
&& chmod a+r /etc/apt/keyrings/docker.asc \
135+
&& printf "Types: deb\n\
136+
URIs: https://download.docker.com/linux/debian\n\
137+
Suites: %s\n\
138+
Components: stable\n\
139+
Signed-By: /etc/apt/keyrings/docker.asc\n" "$(. /etc/os-release && echo "$VERSION_CODENAME")" > /etc/apt/sources.list.d/docker.sources \
140+
&& apt-get update \
141+
&& apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
142+
&& rm -rf /var/lib/apt/lists/*
143+
121144
# ------------------------------------------------------------------------------
122145
# AWS CLI v2
123146
# ------------------------------------------------------------------------------
@@ -148,7 +171,7 @@ ENV CLAUDE_CODE_USE_BEDROCK=false \
148171
ENV GOOGLE_CLOUD_LOCATION=global \
149172
GOOGLE_GENAI_USE_VERTEXAI=true \
150173
GEMINI_MODEL="gemini-3-flash-preview" \
151-
GEMINI_CLI_VERSION=0.21.2
174+
GEMINI_CLI_VERSION=0.22.5
152175

153176
RUN npm install -g "@google/gemini-cli@${GEMINI_CLI_VERSION}"
154177

0 commit comments

Comments
 (0)