优化Dockerfile,不通过代理也能构建成功

This commit is contained in:
jingrow 2025-11-04 01:19:27 +08:00
parent e223caff2c
commit c1a3be92ae

View File

@ -154,32 +154,25 @@ RUN --mount=type=cache,target=/var/cache/apt {{ p.after_install }} \
# symlink mysqldump to mariadb-dump # symlink mysqldump to mariadb-dump
RUN ln -s /usr/bin/mysqldump /usr/bin/mariadb-dump RUN test -f /usr/bin/mariadb-dump || ln -s /usr/bin/mysqldump /usr/bin/mariadb-dump
# Switch to jingrow
USER jingrow
WORKDIR /home/jingrow WORKDIR /home/jingrow
# Install Node using NodeSource (as root to avoid GitHub access via nvm)
# Install Node using NVM
ENV NVM_DIR /home/jingrow/.nvm
ENV {{ pg.get_dependency_version("nvm", True) }}
ENV {{ pg.get_dependency_version("node", True) }} ENV {{ pg.get_dependency_version("node", True) }}
USER root
RUN wget https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh \ RUN NODE_MAJOR=$(echo ${NODE_VERSION} | cut -d. -f1) \
&& bash install.sh \ && curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
&& . "/home/jingrow/.nvm/nvm.sh" \ && apt-get update \
&& nvm install ${NODE_VERSION} \ && apt-get install --yes --no-install-suggests --no-install-recommends nodejs \
&& nvm use v${NODE_VERSION} \ && rm -rf /var/lib/apt/lists/* \
&& nvm alias default v${NODE_VERSION} \
&& rm install.sh \
&& nvm cache clear \
`#stage-pre-node` `#stage-pre-node`
ENV PATH "$PATH:/home/jingrow/.nvm/versions/node/v${NODE_VERSION}/bin" # Install Yarn globally
RUN npm install -g yarn `#stage-pre-yarn`
# Install Yarn # Switch back to jingrow
RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 npm install -g yarn `#stage-pre-yarn` USER jingrow
# Install Bench # Install Bench