[Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile
Alexander V. Tikhonov
avtikhon at tarantool.org
Tue Dec 10 14:21:31 MSK 2019
Set Dockerfile WORKDIR from the very start of Tarantool sources
builds to make the Dockerfile code more readable and removed all
duplicating calls to Tarantool sources directory changes.
---
Dockerfile.staticbuild | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/Dockerfile.staticbuild b/Dockerfile.staticbuild
index 343627746..66342fa4e 100644
--- a/Dockerfile.staticbuild
+++ b/Dockerfile.staticbuild
@@ -64,30 +64,26 @@ RUN set -x && \
COPY . /tarantool
+WORKDIR /tarantool
+
RUN set -x && \
- cd tarantool && \
git submodule init && \
git submodule update
-WORKDIR /tarantool
-
RUN set -x && \
find . -name 'CMakeFiles' -type d -exec rm -rf {} + && \
find . -name 'CMakeCache.txt' -type f -delete
RUN pip install -r /tarantool/test-run/requirements.txt
-RUN set -x \
- && (cd /tarantool; \
- cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DENABLE_DIST:BOOL=ON \
- -DBUILD_STATIC=ON \
- -DOPENSSL_USE_STATIC_LIBS=ON \
- -DOPENSSL_ROOT_DIR=/usr/local \
- .) \
- && make -C /tarantool -j
-
-RUN cd /tarantool && make install
+RUN set -x && \
+ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DENABLE_DIST:BOOL=ON \
+ -DBUILD_STATIC=ON \
+ -DOPENSSL_USE_STATIC_LIBS=ON \
+ -DOPENSSL_ROOT_DIR=/usr/local \
+ . && \
+ make -j && make install
ARG RUN_TESTS
RUN if [ -n "${RUN_TESTS}" ]; then \
--
2.17.1
More information about the Tarantool-patches
mailing list