diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-03-14 14:57:55 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-03-24 18:42:56 +0300 |
| commit | 6aac08009254909aab3e0359f3ad7ab4e87a91e9 (patch) | |
| tree | 09dac4cdb5c13e35375e49e44e51aeff7abc6529 /client | |
| parent | workflows/ci: Bionic to Focal (diff) | |
| download | math-server-6aac08009254909aab3e0359f3ad7ab4e87a91e9.tar.gz math-server-6aac08009254909aab3e0359f3ad7ab4e87a91e9.zip | |
add `make install`, `make test`, etc.
Tests can be called using CTest now.
Diffstat (limited to '')
| -rw-r--r-- | client/Dockerfile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/client/Dockerfile b/client/Dockerfile index c2969ea..2d6e1c2 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -8,22 +8,16 @@ FROM base AS builder ENV src_dir=/usr/src/math-server COPY [".", "$src_dir"] -RUN build_deps='boost-dev cmake g++ make python3' && \ +RUN build_deps='bash boost-dev cmake g++ make python3' && \ apk add --no-cache $build_deps && \ - cd -- "$src_dir/cmake" && \ - python3 -m project.cmake.build \ - --install /opt/math-server \ - --configuration Release \ - -- \ - "$src_dir" \ - -D MATH_SERVER_TESTS=ON \ - -D Boost_USE_STATIC_LIBS=OFF + cd -- "$src_dir" && \ + make install CONFIGURATION=Release CMAKE_FLAGS='-D Boost_USE_STATIC_LIBS=OFF' FROM base LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>" -COPY --from=builder ["/opt/math-server", "/opt/math-server"] +COPY --from=builder ["/usr/src/math-server/.build/install", "/opt/math-server"] RUN runtime_deps='boost-filesystem boost-program_options boost-regex boost-unit_test_framework libstdc++' && \ apk add $runtime_deps && \ |