diff --git a/README.md b/README.md index 7b8aee81..c06ab6dc 100644 --- a/README.md +++ b/README.md @@ -162,14 +162,13 @@ Here is an example for using setup-cpp to make a builder image that has the Cpp FROM ubuntu:22.04 AS base # add setup-cpp -WORKDIR "/" -RUN apt-get update -qq -RUN apt-get install -y --no-install-recommends wget -RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.26.1/setup-cpp-x64-linux" -RUN chmod +x ./setup-cpp-x64-linux +RUN apt-get update && apt-get install -y \ + npm \ + && rm -rf /var/lib/apt/lists/* +RUN npm install -g setup-cpp # install llvm, cmake, ninja, and ccache -RUN ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true +RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true CMD source ~/.cpprc ENTRYPOINT [ "/bin/bash" ] diff --git a/dev/docker/ubuntu.dockerfile b/dev/docker/ubuntu.dockerfile index 444758fb..e25365f1 100644 --- a/dev/docker/ubuntu.dockerfile +++ b/dev/docker/ubuntu.dockerfile @@ -1,15 +1,14 @@ #### Base Image FROM ubuntu:22.04 AS base -# add setup-cpp -WORKDIR "/" -RUN apt-get update -qq -RUN apt-get install -y --no-install-recommends wget -RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.26.1/setup-cpp-x64-linux" -RUN chmod +x ./setup-cpp-x64-linux +# install setup-cpp +RUN apt-get update && apt-get install -y \ + npm \ + && rm -rf /var/lib/apt/lists/* +RUN npm install -g setup-cpp # install llvm, cmake, ninja, and ccache -RUN ./setup-cpp-x64-linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true +RUN setup-cpp --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true CMD source ~/.cpprc ENTRYPOINT [ "/bin/bash" ] diff --git a/dev/docker/ubuntu_node.dockerfile b/dev/docker/ubuntu_node.dockerfile index 02ccdf80..3a851aa1 100644 --- a/dev/docker/ubuntu_node.dockerfile +++ b/dev/docker/ubuntu_node.dockerfile @@ -1,7 +1,8 @@ FROM ubuntu:22.04 AS base -RUN apt-get update -qq -RUN apt-get install -y --no-install-recommends nodejs +RUN apt-get update && apt-get install -y \ + nodejs \ + && rm -rf /var/lib/apt/lists/* # add setup-cpp.js COPY "./dist/node12" "/"