Bootstrap D518 HWLAB tools image from public bases

2026-06-27 11:26:59 +00:00
parent 4d22683d92
commit 68f17a4e39
1 changed files with 6 additions and 1 deletions
@@ -198,8 +198,10 @@ targets:
        dockerfileInline:
          filename: hwlab-ci-node-tools.public.Dockerfile
          lines:
+            - FROM docker.io/oven/bun:1.3.13 AS bun-runtime
+            - FROM docker.io/docker:29-cli AS docker-cli
            - FROM docker.io/library/golang:1.24-bookworm AS golang-toolchain
-            - FROM 127.0.0.1:5000/hwlab/hwlab-ci-node-tools:node22-alpine-bun-v1
+            - FROM docker.io/library/node:22-bookworm-slim
            - ARG HTTP_PROXY
            - ARG HTTPS_PROXY
            - ARG ALL_PROXY
@@ -208,7 +210,10 @@ targets:
            - ARG https_proxy
            - ARG all_proxy
            - ARG no_proxy
+            - RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates git openssh-client python3 && rm -rf /var/lib/apt/lists/*
            - COPY --from=golang-toolchain /usr/local/go /usr/local/go
+            - COPY --from=bun-runtime /usr/local/bin/bun /usr/local/bin/bun
+            - COPY --from=docker-cli /usr/local/bin/docker /usr/local/bin/docker
            - ENV PATH=/usr/local/go/bin:$PATH
            - RUN ln -sf /usr/local/bin/bun /usr/local/bin/bunx
            - ENV HWLAB_CI_NODE_DEPS=/opt/hwlab-ci-node-deps/node_modules