From 373e20d7b142afb389be336bd03e7f92cec2331c Mon Sep 17 00:00:00 2001 From: Andrey Doronin Date: Mon, 22 Sep 2025 18:36:33 +0300 Subject: [PATCH 1/2] fix(x64-glibc-217): use modern gcc and python from conda-forge --- recipes/x64-glibc-217/Dockerfile | 26 +++++++++----------------- recipes/x64-glibc-217/run.sh | 13 +++++++------ recipes/x64-glibc-217/should-build.sh | 2 +- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/recipes/x64-glibc-217/Dockerfile b/recipes/x64-glibc-217/Dockerfile index f83868d..e793c95 100644 --- a/recipes/x64-glibc-217/Dockerfile +++ b/recipes/x64-glibc-217/Dockerfile @@ -6,32 +6,16 @@ ARG UID=1000 RUN groupadd --gid $GID node \ && adduser --gid $GID --uid $UID node -RUN cat < Date: Tue, 23 Sep 2025 11:38:54 +0300 Subject: [PATCH 2/2] fix(x64-glibc-217): switch to micromamba instead of miniforge --- recipes/x64-glibc-217/Dockerfile | 14 +++++++------- recipes/x64-glibc-217/run.sh | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/recipes/x64-glibc-217/Dockerfile b/recipes/x64-glibc-217/Dockerfile index e793c95..b682882 100644 --- a/recipes/x64-glibc-217/Dockerfile +++ b/recipes/x64-glibc-217/Dockerfile @@ -25,12 +25,12 @@ VOLUME /home/node/node.tar.xz USER node -RUN cd "/home/node" && curl -LO https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh \ - && bash Miniforge3-Linux-x86_64.sh -b \ - && rm Miniforge3-Linux-x86_64.sh -ENV PATH="/home/node/miniforge3/bin:${PATH}" -RUN mamba install -y \ - python=3.12 \ - gxx=15 +ENV PATH="/home/node/.local/bin:${PATH}" + +RUN curl -L micro.mamba.pm/install.sh | bash -s -- -y \ + && eval "$(micromamba shell hook --shell bash)" \ + && micromamba install -y \ + python=3.12 \ + gxx=15 ENTRYPOINT [ "/home/node/run.sh" ] diff --git a/recipes/x64-glibc-217/run.sh b/recipes/x64-glibc-217/run.sh index 17631a4..0d77c48 100755 --- a/recipes/x64-glibc-217/run.sh +++ b/recipes/x64-glibc-217/run.sh @@ -35,6 +35,9 @@ cd "${nodeDir}"/deps/v8/src cd "${nodeDir}" +eval "$(micromamba shell hook --shell bash)" +micromamba activate + export CC="ccache gcc" export CXX="ccache g++" export MAJOR_VERSION=$(echo ${fullversion} | cut -d . -f 1 | tr --delete v)