ci: use debian_node docker file in the ci

This commit is contained in:
Amin Yahyaabadi 2021-12-11 06:29:28 -06:00
parent 1733a8f982
commit 75bad90eef
4 changed files with 7 additions and 7 deletions

View File

@ -67,7 +67,7 @@ chmod +x setup_cpp_mac
sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true 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. For the tools, instead of `true` that chooses the default version, you can pass a specific version.
### With Nodejs ### 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 wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.1/setup_cpp_linux"
RUN chmod +x ./setup_cpp_linux RUN chmod +x ./setup_cpp_linux
# install llvm, cmake, ninja, ccache, and vcpkg # install llvm, cmake, ninja, and ccache
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true
ENTRYPOINT [ "/bin/sh" ] ENTRYPOINT [ "/bin/sh" ]
``` ```

View File

@ -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 wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.5.1/setup_cpp_linux"
RUN chmod +x ./setup_cpp_linux RUN chmod +x ./setup_cpp_linux
# install llvm, cmake, ninja, ccache, and conan # install llvm, cmake, ninja, and ccache
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --conan true RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true
ENTRYPOINT [ "/bin/sh" ] ENTRYPOINT [ "/bin/sh" ]

View File

@ -6,6 +6,6 @@ ADD "./dist/" "/"
WORKDIR "/" WORKDIR "/"
# run installation # 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" ] ENTRYPOINT [ "/bin/sh" ]

View File

@ -13,7 +13,7 @@
}, },
"scripts": { "scripts": {
"build": "cross-env NODE_ENV=production parcel build --detailed-report", "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", "clean": "shx rm -rf dist exe",
"dev": "cross-env NODE_ENV=development parcel watch", "dev": "cross-env NODE_ENV=development parcel watch",
"format": "prettier --write .", "format": "prettier --write .",