mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1151 from pikasTech/issue-1148-d518-tools-image-fix

Browse Source 
Fix D518 tools image bootstrap target
This commit is contained in:
Lyon
2026-06-27 19:28:49 +08:00
committed by GitHub
parent feecdaa60f af1e2dd5b2
commit be8ba3c2a7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/hwlab-node-control-plane.yaml
+7 -7
View File
@@ -198,10 +198,8 @@ 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 docker.io/library/node:22-bookworm-slim
- FROM 127.0.0.1:5000/hwlab/hwlab-ci-node-tools:node22-alpine-bun-v1
- ARG HTTP_PROXY
- ARG HTTPS_PROXY
- ARG ALL_PROXY
@@ -210,10 +208,7 @@ 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
@@ -346,8 +341,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
@@ -356,7 +353,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