From 75bad90eef8faf920b021d968e19679fd67c5d25 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sat, 11 Dec 2021 06:29:28 -0600 Subject: [PATCH] ci: use debian_node docker file in the ci --- README.md | 6 +++--- building/docker/debian.dockerfile | 4 ++-- building/docker/debian_node.dockerfile | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bf55c396..7bf24668 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ chmod +x setup_cpp_mac sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true ``` -NOTE: In the `compiler` entry, you can specify the version after `-` like `llvm-11`. +NOTE: In the `compiler` entry, you can specify the version after `-` like `llvm-11.0.0`. For the tools, instead of `true` that chooses the default version, you can pass a specific version. ### With Nodejs @@ -165,8 +165,8 @@ RUN apt-get install -y --no-install-recommends ca-certificates wget unzip RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.1/setup_cpp_linux" RUN chmod +x ./setup_cpp_linux -# install llvm, cmake, ninja, ccache, and vcpkg -RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true +# install llvm, cmake, ninja, and ccache +RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true ENTRYPOINT [ "/bin/sh" ] ``` diff --git a/building/docker/debian.dockerfile b/building/docker/debian.dockerfile index 79d0648d..1d44f15e 100644 --- a/building/docker/debian.dockerfile +++ b/building/docker/debian.dockerfile @@ -9,7 +9,7 @@ RUN apt-get install -y --no-install-recommends ca-certificates wget unzip RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.1/setup_cpp_linux" RUN chmod +x ./setup_cpp_linux -# install llvm, cmake, ninja, ccache, and conan -RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --conan true +# install llvm, cmake, ninja, and ccache +RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true ENTRYPOINT [ "/bin/sh" ] diff --git a/building/docker/debian_node.dockerfile b/building/docker/debian_node.dockerfile index e19d1f28..16534a86 100644 --- a/building/docker/debian_node.dockerfile +++ b/building/docker/debian_node.dockerfile @@ -6,6 +6,6 @@ ADD "./dist/" "/" WORKDIR "/" # run installation -RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --conan true +RUN node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true ENTRYPOINT [ "/bin/sh" ] \ No newline at end of file diff --git a/package.json b/package.json index 4670fbf5..dea392dd 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "build": "cross-env NODE_ENV=production parcel build --detailed-report", - "build.docker": "pnpm build && docker build -f ./building/docker/debian.dockerfile -t setup_cpp .", + "build.docker": "pnpm build && docker build -f ./building/docker/debian_node.dockerfile -t setup_cpp .", "clean": "shx rm -rf dist exe", "dev": "cross-env NODE_ENV=development parcel watch", "format": "prettier --write .",