diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b3346cb6..11243702 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -134,7 +134,6 @@ jobs: - "ubuntu_node_legacy.dockerfile" - "ubuntu_20.04_node_legacy.dockerfile" - "ubuntu_20.04_node.dockerfile" - - "ubuntu_22.04_node.dockerfile" - "arch_node.dockerfile" - "fedora_node.dockerfile" cache_reset_counter: diff --git a/dev/docker/ubuntu_22.04_node.dockerfile b/dev/docker/ubuntu_22.04_node.dockerfile deleted file mode 100644 index 5ab7dc0d..00000000 --- a/dev/docker/ubuntu_22.04_node.dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -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 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" "/" -WORKDIR "/" - -# run installation -RUN node ./setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true - -CMD ["source", "~/.cpprc"] -ENTRYPOINT ["/bin/bash"] - - -#### Building -FROM base as builder -COPY ./dev/cpp_vcpkg_project /home/app -WORKDIR /home/app -RUN bash -c 'source ~/.cpprc \ - && task build' - - -### Running environment -# use a distroless image or ubuntu:20.04 if you wish -FROM gcr.io/distroless/cc as runner -# copy the built binaries and their runtime dependencies -COPY --from=builder /home/app/build/my_exe/Release/ /home/app/ -WORKDIR /home/app/ -ENTRYPOINT ["./my_exe"] diff --git a/dev/docker/ubuntu_node.dockerfile b/dev/docker/ubuntu_node.dockerfile index 7d852c2f..8e97e54a 100644 --- a/dev/docker/ubuntu_node.dockerfile +++ b/dev/docker/ubuntu_node.dockerfile @@ -1,15 +1,26 @@ FROM ubuntu:22.04 AS base -RUN apt-get update -qq && apt-get install -y --no-install-recommends curl gnupg -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - -RUN apt-get update -qq && apt-get install -y --no-install-recommends nodejs +# 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 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" "/" WORKDIR "/" # run installation -RUN node ./setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true --powershell true +RUN . $NVM_DIR/nvm.sh && node ./setup-cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --task true --powershell true CMD ["source", "~/.cpprc"] ENTRYPOINT [ "/bin/bash" ]