Skip to content

Commit 85016ae

Browse files
committed
update vscode devcontainer
1 parent 5506936 commit 85016ae

2 files changed

Lines changed: 23 additions & 15 deletions

File tree

.github/workflows/main.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
include:
2525
- image_name: vscode-devcontainer
26-
image_tag: 20260109
26+
image_tag: 20260112
2727
filter_ref: gh-devcontainer
2828
dockerfile_path: vscode-devcontainer/versions/go1.25-node25/
2929
platforms: linux/amd64,linux/arm64
@@ -79,6 +79,17 @@ jobs:
7979
dockerfile_path: cli-tools/postgres-backup/versions/9.6/
8080

8181
steps:
82+
- name: Delete huge unnecessary tools folder
83+
run: rm -rf /opt/hostedtoolcache
84+
85+
# Docker ボリュームの調整
86+
- name: Adjutment docker volumes
87+
run: |
88+
docker system df
89+
docker system prune -a --volumes -f
90+
docker system df
91+
92+
# Checkout repository
8293
- name: Checkout repository
8394
if: contains(github.ref, matrix.filter_ref)
8495
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

vscode-devcontainer/versions/go1.25-node25/Dockerfile

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@ ARG DEBIAN_VERSION=trixie-20251208
99
# ARG DEBIAN_VERSION=trixie-debian13-fips
1010

1111
# ==============================================================================
12-
# Stage 1: Go Tool Builder
12+
# Stage 0: Go SDK (Target Architecture)
1313
# ==============================================================================
14-
FROM golang:${GO_VERSION}-bookworm AS go-builder
15-
# FROM dhi.io/golang:${GO_VERSION}-dev AS go-builder
14+
FROM golang:${GO_VERSION}-bookworm AS go-sdk
15+
16+
# ==============================================================================
17+
# Stage 1: Go Tool Builder (Cross-Compilation)
18+
# ==============================================================================
19+
FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS tool-builder
1620

1721
ARG TARGETARCH
1822

@@ -78,6 +82,7 @@ RUN --mount=type=cache,target=/var/cache/apt/archives,id=apt-archives-${TARGETAR
7882
libprotobuf-dev \
7983
gnupg lsb-release \
8084
locales \
85+
lsof iproute2 \
8186
&& localedef -f UTF-8 -i ja_JP ja_JP.UTF-8 \
8287
&& rm -rf /var/lib/apt/lists/*
8388

@@ -94,14 +99,6 @@ RUN curl -L -o flyway.tar.gz https://repo1.maven.org/maven2/org/flywaydb/flyway-
9499
&& ln -s /opt/flyway/flyway /usr/local/bin/flyway \
95100
&& rm flyway.tar.gz
96101

97-
# ------------------------------------------------------------------------------
98-
# OpenAPI Generator CLI
99-
# ------------------------------------------------------------------------------
100-
ENV OPENAPI_GENERATOR_VERSION=7.17.0
101-
102-
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 \
103-
&& chmod +x /usr/local/bin/openapi-generator-cli
104-
105102
# ------------------------------------------------------------------------------
106103
# Python Tools (uv など)
107104
# ------------------------------------------------------------------------------
@@ -113,7 +110,7 @@ ENV PATH=/root/.local/bin:$PATH
113110
# ------------------------------------------------------------------------------
114111
ENV NPM_VERSION=11.7.0 \
115112
PNPM_VERSION=10.27.0 \
116-
RULESYNC_VERSION=5.2.0 \
113+
RULESYNC_VERSION=5.2.1 \
117114
CONTEXT7_VERSION=2.1.0
118115

119116
RUN curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \
@@ -180,11 +177,11 @@ RUN npm install -g "@google/gemini-cli@${GEMINI_CLI_VERSION}"
180177
# ------------------------------------------------------------------------------
181178
# Go
182179
# ------------------------------------------------------------------------------
183-
COPY --from=go-builder /usr/local/go /usr/local/go
180+
COPY --from=go-sdk /usr/local/go /usr/local/go
184181
ENV PATH=$PATH:/usr/local/go/bin:/go/bin
185182
ENV GOPATH=/go
186183

187-
COPY --from=go-builder /go/bin /go/bin
184+
COPY --from=tool-builder /go/bin /go/bin
188185

189186
ENV CGO_ENABLED=0 \
190187
GO111MODULE=on \

0 commit comments

Comments
 (0)