Skip to content

Commit f62941a

Browse files
committed
devcontainer v20260315
1 parent 1e7106e commit f62941a

2 files changed

Lines changed: 37 additions & 22 deletions

File tree

.github/workflows/main.yml

Lines changed: 2 additions & 2 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: 20260217
26+
image_tag: 20260315
2727
filter_ref: gh-devcontainer
28-
dockerfile_path: vscode-devcontainer/versions/go1.25-node25/
28+
dockerfile_path: vscode-devcontainer/versions/go1.26-node25/
2929
platforms: linux/amd64,linux/arm64
3030
- image_name: shellcheck
3131
image_tag: 0.7

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

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# ==============================================================================
44
# Global Arguments
55
# ==============================================================================
6-
ARG GO_VERSION=1.26.0
6+
ARG GO_VERSION=1.26.1
77
ARG DEBIAN_VERSION=trixie-20260202
8-
# ARG GO_VERSION=1.26.0-debian13
8+
# ARG GO_VERSION=1.26.1-debian13
99
# ARG DEBIAN_VERSION=trixie-debian13-fips
1010

1111
# ==============================================================================
@@ -24,23 +24,29 @@ ENV CGO_ENABLED=0 \
2424
GOOS=linux \
2525
GOARCH=${TARGETARCH}
2626

27-
ENV AIR_VERSION=v1.64.5 \
28-
DELVE_VERSION=v1.26.0 \
27+
ENV TBLS_VERSION=v1.92.3 \
28+
AIR_VERSION=v1.64.5 \
29+
DELVE_VERSION=v1.26.1 \
2930
MOCKGEN_VERSION=v0.6.0 \
30-
BUF_VERSION=v1.65.0 \
31-
PROTOC_GEN_VALIDATE_VERSION=v1.2.1 \
32-
PROTOC_GEN_GO_VERSION=v1.36.10 \
33-
PROTOC_GEN_GO_GRPC_VERSION=v1.6.0 \
31+
TEMPL_VERSION=v0.3.1001 \
32+
BUF_VERSION=v1.66.1 \
33+
PROTOC_GEN_VALIDATE_VERSION=v1.3.3 \
34+
PROTOC_GEN_GO_VERSION=v1.36.11 \
35+
PROTOC_GEN_GO_GRPC_VERSION=v1.6.1 \
3436
PROTOC_GEN_CONNECT_GO_VERSION=v1.19.1 \
35-
GRPC_GATEWAY_VERSION=v2.27.8 \
36-
OAPI_VERSION=v2.5.1 \
37-
GOLANGCI_LINT_VERSION=v2.9.0
37+
GRPC_GATEWAY_VERSION=v2.28.0 \
38+
OAPI_VERSION=v2.6.0 \
39+
GOLANGCI_LINT_VERSION=v2.11.3
3840

3941
RUN --mount=type=cache,target=/go/pkg/mod \
4042
--mount=type=cache,target=/root/.cache/go-build \
43+
go install golang.org/x/tools/gopls@latest && \
44+
go install golang.org/x/tools/cmd/goimports@latest && \
45+
go install github.com/k1LoW/tbls@${TBLS_VERSION} && \
4146
go install github.com/air-verse/air@${AIR_VERSION} && \
4247
go install github.com/go-delve/delve/cmd/dlv@${DELVE_VERSION} && \
4348
go install go.uber.org/mock/mockgen@${MOCKGEN_VERSION} && \
49+
go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION} && \
4450
go install github.com/bufbuild/buf/cmd/buf@${BUF_VERSION} && \
4551
go install github.com/envoyproxy/protoc-gen-validate/cmd/protoc-gen-validate-go@${PROTOC_GEN_VALIDATE_VERSION} && \
4652
go install google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VERSION} && \
@@ -76,11 +82,13 @@ RUN --mount=type=cache,target=/var/cache/apt/archives,id=apt-archives-${TARGETAR
7682
openjdk-25-jdk-headless \
7783
maven \
7884
jq \
85+
less \
7986
python3 \
8087
python3-pip \
8188
protobuf-compiler \
8289
libprotobuf-dev \
8390
gnupg lsb-release \
91+
postgresql-client \
8492
locales \
8593
lsof iproute2 \
8694
&& localedef -f UTF-8 -i ja_JP ja_JP.UTF-8 \
@@ -99,6 +107,14 @@ RUN curl -L -o flyway.tar.gz https://repo1.maven.org/maven2/org/flywaydb/flyway-
99107
&& ln -s /opt/flyway/flyway /usr/local/bin/flyway \
100108
&& rm flyway.tar.gz
101109

110+
# ------------------------------------------------------------------------------
111+
# OpenAPI Generator
112+
# ------------------------------------------------------------------------------
113+
ENV OPENAPI_GENERATOR_VERSION=7.20.0
114+
115+
RUN curl -fsSL https://raw.githubusercontent.com/OpenAPITools/openapi-generator/"v${OPENAPI_GENERATOR_VERSION}"/bin/utils/openapi-generator-cli.sh -o /usr/local/bin/openapi-generator-cli \
116+
&& chmod +x /usr/local/bin/openapi-generator-cli
117+
102118
# ------------------------------------------------------------------------------
103119
# Python Tools (uv など)
104120
# ------------------------------------------------------------------------------
@@ -108,10 +124,9 @@ ENV PATH=/root/.local/bin:$PATH
108124
# ------------------------------------------------------------------------------
109125
# Node.js Tools (pnpm, rulesync など)
110126
# ------------------------------------------------------------------------------
111-
ENV NPM_VERSION=11.10.0 \
112-
PNPM_VERSION=10.29.3 \
113-
RULESYNC_VERSION=7.3.0 \
114-
CONTEXT7_VERSION=2.1.0
127+
ENV NPM_VERSION=11.11.1 \
128+
PNPM_VERSION=10.32.1 \
129+
RULESYNC_VERSION=7.18.2
115130

116131
RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \
117132
&& apt-get install -y nodejs
@@ -160,15 +175,16 @@ ENV CLAUDE_CODE_USE_BEDROCK=false \
160175
AWS_REGION=ap-northeast-1 \
161176
CLAUDE_CODE_USE_VERTEX=false \
162177
CLOUD_ML_REGION=global \
163-
ANTHROPIC_MODEL=claude-sonnet-4-5-20250929 \
164-
ANTHROPIC_SMALL_FAST_MODEL=claude-haiku-4-5-20251001
178+
ANTHROPIC_MODEL=claude-sonnet-4-6@default \
179+
ANTHROPIC_SMALL_FAST_MODEL=claude-haiku-4-5@20251001
165180

166181
# ------------------------------------------------------------------------------
167182
# Gemini
168183
# ------------------------------------------------------------------------------
169184
ENV GOOGLE_CLOUD_LOCATION=global \
170185
GOOGLE_GENAI_USE_VERTEXAI=true \
171-
GEMINI_CLI_VERSION=0.28.2
186+
GEMINI_CLI_VERSION=0.33.1 \
187+
ADK_SUPPRESS_GEMINI_LITELLM_WARNINGS=true
172188

173189
RUN npm install -g "@google/gemini-cli@${GEMINI_CLI_VERSION}"
174190

@@ -182,7 +198,6 @@ ENV GOPATH=/go
182198
COPY --from=tool-builder /go/bin /go/bin
183199

184200
ENV CGO_ENABLED=0 \
185-
GO111MODULE=on \
186-
GOEXPERIMENT=rangefunc
201+
GO111MODULE=on
187202

188203
ENTRYPOINT [ "sleep", "infinity" ]

0 commit comments

Comments
 (0)