diff --git a/Dockerfile b/Dockerfile index 91b3d49..fefde87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,16 +34,19 @@ RUN mkdir -p /tmp/boost-src \ RUN cd /tmp/boost-src \ && ./b2 -j"$(nproc)" install +ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH + # Project copy WORKDIR /project # COPY . /project EXPOSE 8080 -RUN set -eux; pwd; ls -la /project; test -f /project/CMakeLists.txt # Build & Run project -RUN mkdir /project/dist -RUN ls -la /project -RUN cmake -S /project -B /project/dist -Dmysql-concpp_DIR=/opt/mysql-concpp -RUN cmake --build /project/dist -RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf && ldconfig -CMD ["/project/dist/App", "0.0.0.0", "8080", ".", "12", "mysqlx://root:root@host.docker.internal:33060"] +CMD ["bash", "-lc", "\ + set -euo pipefail; \ + test -f /project/CMakeLists.txt; \ + mkdir -p /project/dist; \ + cmake -S /project -B /project/dist -Dmysql-concpp_DIR=/opt/mysql-concpp; \ + cmake --build /project/dist -j\"$(nproc)\"; \ + exec /project/dist/App 0.0.0.0 8080 . 12 mysqlx://root:root@host.docker.internal:33060 \ +"] diff --git a/README.md b/README.md index d828c63..8c1229e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Запуск(С Docker): - $env:DOCKER_BUILDKIT=1; docker build --progress=plain -t up_and_down . -- docker run --rm -v "$(pwd)":/project -p 8080:8080 up_and_down +- docker run --rm -v //c/CLionProjects/UpAndDown:/project -p 8080:8080 up_and_down # TODO: