From bfe7d5afde01d1ac1d616bf7619be54a5c213b26 Mon Sep 17 00:00:00 2001 From: abeimler Date: Thu, 6 Apr 2023 14:40:23 +0200 Subject: [PATCH] ci: fix node install with nvm --- dev/docker/ubuntu_20.04_node.dockerfile | 16 +++++++++++++--- dev/docker/ubuntu_20.04_node_legacy.dockerfile | 16 +++++++++++++--- dev/docker/ubuntu_22.04_node.dockerfile | 17 +++++++++++++---- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dev/docker/ubuntu_20.04_node.dockerfile b/dev/docker/ubuntu_20.04_node.dockerfile index 942442b9..6f3747c9 100644 --- a/dev/docker/ubuntu_20.04_node.dockerfile +++ b/dev/docker/ubuntu_20.04_node.dockerfile @@ -4,11 +4,21 @@ FROM ubuntu:20.04 as base ENV TZ=Canada/Pacific RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# install node with nvm +RUN apt-get update -qq && apt-get install -y --no-install-recommends git curl wget ca-certificates ARG nvm_version="0.39.3" ARG node_version="16.20.0" -RUN touch ~/.bashrc && chmod +x ~/.bashrc -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh | bash -RUN source ~/.nvm/nvm.sh && nvm install ${node_version} +RUN mkdir /usr/local/nvm +ENV NVM_DIR /usr/local/nvm +ADD https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh /nvm_install.sh +RUN chmod +x /nvm_install.sh && /nvm_install.sh \ + && . $NVM_DIR/nvm.sh \ + && nvm install $node_version \ + && nvm alias default $node_version \ + && nvm use default +ENV NODE_PATH $NVM_DIR/v${node_version}/lib/node_modules +ENV PATH $NVM_DIR/versions/node/v${node_version}/bin:$PATH + # add setup-cpp.js COPY "./dist/node16" "/" diff --git a/dev/docker/ubuntu_20.04_node_legacy.dockerfile b/dev/docker/ubuntu_20.04_node_legacy.dockerfile index 2a44a4e6..977c23e9 100644 --- a/dev/docker/ubuntu_20.04_node_legacy.dockerfile +++ b/dev/docker/ubuntu_20.04_node_legacy.dockerfile @@ -4,10 +4,20 @@ FROM ubuntu:20.04 as base ENV TZ=Canada/Pacific RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# install node with nvm +RUN apt-get update -qq && apt-get install -y --no-install-recommends git curl wget ca-certificates ARG nvm_version="0.39.3" -RUN touch ~/.bashrc && chmod +x ~/.bashrc -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh | bash -RUN source ~/.nvm/nvm.sh && nvm install 12 +ARG node_version="12.22.12" +RUN mkdir /usr/local/nvm +ENV NVM_DIR /usr/local/nvm +ADD https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh /nvm_install.sh +RUN chmod +x /nvm_install.sh && /nvm_install.sh \ + && . $NVM_DIR/nvm.sh \ + && nvm install $node_version \ + && nvm alias default $node_version \ + && nvm use default +ENV NODE_PATH $NVM_DIR/v${node_version}/lib/node_modules +ENV PATH $NVM_DIR/versions/node/v${node_version}/bin:$PATH # add setup-cpp.js COPY "./dist/node12" "/" diff --git a/dev/docker/ubuntu_22.04_node.dockerfile b/dev/docker/ubuntu_22.04_node.dockerfile index f5c3473b..5ab7dc0d 100644 --- a/dev/docker/ubuntu_22.04_node.dockerfile +++ b/dev/docker/ubuntu_22.04_node.dockerfile @@ -1,14 +1,23 @@ -FROM ubuntu:20.04 as base +FROM ubuntu:22.04 as base # set time-zone ENV TZ=Canada/Pacific RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +# install node with nvm +RUN apt-get update -qq && apt-get install -y --no-install-recommends git curl wget ca-certificates ARG nvm_version="0.39.3" ARG node_version="18.15.0" -RUN touch ~/.bashrc && chmod +x ~/.bashrc -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh | bash -RUN source ~/.nvm/nvm.sh && nvm install ${node_version} +RUN mkdir /usr/local/nvm +ENV NVM_DIR /usr/local/nvm +ADD https://raw.githubusercontent.com/nvm-sh/nvm/v${nvm_version}/install.sh /nvm_install.sh +RUN chmod +x /nvm_install.sh && /nvm_install.sh \ + && . $NVM_DIR/nvm.sh \ + && nvm install $node_version \ + && nvm alias default $node_version \ + && nvm use default +ENV NODE_PATH $NVM_DIR/v${node_version}/lib/node_modules +ENV PATH $NVM_DIR/versions/node/v${node_version}/bin:$PATH # add setup-cpp.js COPY "./dist/node18" "/"