From 1896bcb183187a1a6e2e664ddb04a245cfc15946 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 9 Dec 2019 16:16:25 +0300
Subject: Docker: refactor Dockerfile-s

---
 server/Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'server')

diff --git a/server/Dockerfile b/server/Dockerfile
index 599b81f..8234da8 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -16,17 +16,19 @@ RUN apt-get update -yq && \
         libboost-program-options-dev \
         libboost-test-dev
 
-COPY [".", "/tmp/src/"]
+ENV src_dir=/tmp/src \
+    build_dir=/tmp/build
 
-WORKDIR /tmp/build
+COPY [".", "$src_dir"]
+
+WORKDIR $build_dir
 
 RUN cmake -G "Unix Makefiles"              \
         -D CMAKE_BUILD_TYPE=Release        \
         -D CMAKE_INSTALL_PREFIX=/usr/local \
         -D ENABLE_TESTS=ON                 \
-        /tmp/src &&                        \
+        "$src_dir" &&                      \
     cmake --build . --config Release --target install && \
     /usr/local/bin/unit_tests --log_level=all
-    cmake --build server
 
 CMD ["/usr/local/bin/server"]
-- 
cgit v1.2.3