From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 4B4FF46970E for ; Wed, 18 Dec 2019 18:03:31 +0300 (MSK) Date: Wed, 18 Dec 2019 18:01:21 +0300 From: Igor Munkin Message-ID: <20191218150120.GT1214@tarantool.org> References: <7e60cf944da3467761c5d9ff5481a7754e3dc4f4.1575976611.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <7e60cf944da3467761c5d9ff5481a7754e3dc4f4.1575976611.git.avtikhon@tarantool.org> Subject: Re: [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 V. Tikhonov" Cc: tarantool-patches@dev.tarantool.org Sasha, Thanks, the patch LGTM. Please consider the comment I left in the first patch about the commit subject tag. Side note: I'm totally not a docker master and I guess links such as this one[1] can be very useful for further maintenance. Feel free to drop them into your next commit messages. On 10.12.19, Alexander V. Tikhonov wrote: > 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 > [1]: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#workdir -- Best regards, IM