diff --git a/config/hwlab-node-control-plane.yaml b/config/hwlab-node-control-plane.yaml index 601d51d0..c5e40454 100644 --- a/config/hwlab-node-control-plane.yaml +++ b/config/hwlab-node-control-plane.yaml @@ -129,16 +129,7 @@ targets: dockerfileInline: filename: hwlab-ci-node-tools.public.Dockerfile lines: - - ARG NODE_IMAGE=docker.io/library/node:22-bookworm-slim - - ARG BUN_IMAGE=docker.io/oven/bun:1.3.13 - - ARG TOOLS_BASE_IMAGE=docker.io/buildpack-deps:bookworm-scm - - ARG PYTHON_IMAGE=docker.io/library/python:3.12-slim-bookworm - - ARG DOCKER_CLI_IMAGE=docker.io/docker:29-cli - - FROM ${BUN_IMAGE} AS bun-runtime - - FROM ${NODE_IMAGE} AS node-runtime - - FROM ${PYTHON_IMAGE} AS python-runtime - - FROM ${DOCKER_CLI_IMAGE} AS docker-cli-runtime - - FROM ${TOOLS_BASE_IMAGE} + - FROM 127.0.0.1:5000/hwlab/hwlab-ci-node-tools:node22-alpine-bun-v1 - ARG HTTP_PROXY - ARG HTTPS_PROXY - ARG ALL_PROXY @@ -147,20 +138,11 @@ targets: - ARG https_proxy - ARG all_proxy - ARG no_proxy - - COPY --from=node-runtime /usr/local /usr/local - - COPY --from=bun-runtime /usr/local/bin/bun /usr/local/bin/bun - - COPY --from=python-runtime /usr/local /usr/local - - COPY --from=docker-cli-runtime /usr/local/bin/docker /usr/local/bin/docker - RUN ln -sf /usr/local/bin/bun /usr/local/bin/bunx - ENV HWLAB_CI_NODE_DEPS=/opt/hwlab-ci-node-deps/node_modules - RUN set -eu; mkdir -p /opt/hwlab-ci-node-deps; cd /opt/hwlab-ci-node-deps; npm init -y >/dev/null; if [ -n "${HTTP_PROXY:-}" ]; then npm config set proxy "$HTTP_PROXY"; fi; if [ -n "${HTTPS_PROXY:-}" ]; then npm config set https-proxy "$HTTPS_PROXY"; fi; npm install --omit=dev --ignore-scripts --no-audit --no-fund yaml@2.8.3; node --input-type=module -e 'import("yaml").then(() => console.log("yaml-ok"))' - RUN node --version && npm --version && bun --version && git --version && python3 --version && docker --version && ssh -V - buildArgs: - NODE_IMAGE: docker.io/library/node:22-bookworm-slim - BUN_IMAGE: docker.io/oven/bun:1.3.13 - TOOLS_BASE_IMAGE: docker.io/buildpack-deps:bookworm-scm - PYTHON_IMAGE: docker.io/library/python:3.12-slim-bookworm - DOCKER_CLI_IMAGE: docker.io/docker:29-cli + buildArgs: {} buildNetwork: host publicBaseImages: - docker.io/library/node:22-bookworm-slim