From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 955CA4696C2 for ; Tue, 10 Dec 2019 14:21:38 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Tue, 10 Dec 2019 14:21:31 +0300 Message-Id: <7e60cf944da3467761c5d9ff5481a7754e3dc4f4.1575976611.git.avtikhon@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko Cc: tarantool-patches@dev.tarantool.org 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