diff --git a/dev/cpp_vcpkg_project b/dev/cpp_vcpkg_project index f4fe2164..8775a79c 160000 --- a/dev/cpp_vcpkg_project +++ b/dev/cpp_vcpkg_project @@ -1 +1 @@ -Subproject commit f4fe216401a8eac95d66969f0ee2b760b3c4edf0 +Subproject commit 8775a79c3af6d7efe193ff26afadb45bd74ed894 diff --git a/dev/docker/ubuntu.dockerfile b/dev/docker/ubuntu.dockerfile index cda87ccc..c2f1ec3e 100644 --- a/dev/docker/ubuntu.dockerfile +++ b/dev/docker/ubuntu.dockerfile @@ -9,7 +9,7 @@ RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0. RUN chmod +x ./setup_cpp_linux # install llvm, cmake, ninja, and ccache -RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --make true +RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true --task true CMD source ~/.cpprc ENTRYPOINT [ "/bin/bash" ] @@ -19,7 +19,7 @@ FROM base AS builder ADD ./dev/cpp_vcpkg_project /home/app WORKDIR /home/app RUN bash -c 'source ~/.cpprc \ - && make build' + && task build' ### Running environment # use a distroless image or ubuntu:22.04 if you wish diff --git a/dev/docker/ubuntu_20.04_node.dockerfile b/dev/docker/ubuntu_20.04_node.dockerfile index b4120ac7..8396577c 100644 --- a/dev/docker/ubuntu_20.04_node.dockerfile +++ b/dev/docker/ubuntu_20.04_node.dockerfile @@ -8,7 +8,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq RUN apt-get install -y --no-install-recommends curl gnupg ca-certificates -RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - RUN apt-get install -y --no-install-recommends nodejs # add setup_cpp.js @@ -16,7 +16,7 @@ ADD "./dist/" "/" WORKDIR "/" # run installation -RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --make true +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" ] @@ -25,8 +25,8 @@ ENTRYPOINT [ "/bin/bash" ] FROM base AS builder ADD ./dev/cpp_vcpkg_project /home/app WORKDIR /home/app -RUN bash -c 'source ~/.cpprc \ - && make build' +RUN bash -c 'source ~/.cpprc \ + && task build' ### Running environment # use a distroless image or ubuntu:20.04 if you wish diff --git a/dev/docker/ubuntu_node.dockerfile b/dev/docker/ubuntu_node.dockerfile index e1255306..2eb0ede5 100644 --- a/dev/docker/ubuntu_node.dockerfile +++ b/dev/docker/ubuntu_node.dockerfile @@ -8,7 +8,7 @@ ADD "./dist/" "/" WORKDIR "/" # run installation -RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --cppcheck true --ccache true --vcpkg true --doxygen true --gcovr true --make true +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" ] @@ -17,8 +17,8 @@ ENTRYPOINT [ "/bin/bash" ] FROM base AS builder ADD ./dev/cpp_vcpkg_project /home/app WORKDIR /home/app -RUN bash -c 'source ~/.cpprc \ - && make build' +RUN bash -c 'source ~/.cpprc \ + && task build' ### Running environment # use a distroless image or ubuntu:22.04 if you wish