Tarantool development patches archive
 help / color / mirror / Atom feed
From: Igor Munkin <imun@tarantool.org>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile
Date: Wed, 18 Dec 2019 18:01:21 +0300	[thread overview]
Message-ID: <20191218150120.GT1214@tarantool.org> (raw)
In-Reply-To: <7e60cf944da3467761c5d9ff5481a7754e3dc4f4.1575976611.git.avtikhon@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

  reply	other threads:[~2019-12-18 15:03 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 11:21 [Tarantool-patches] [PATCH v2 0/5] Improved the static build based on Dockerfile Alexander V. Tikhonov
2019-12-10 11:21 ` [Tarantool-patches] [PATCH v2 1/5] static build: speedup build Alexander V. Tikhonov
2019-12-18 12:21   ` Igor Munkin
2019-12-19  9:26     ` Alexander Tikhonov
2020-04-01  9:56       ` Sergey Bronnikov
2019-12-10 11:21 ` [Tarantool-patches] [PATCH v2 2/5] static build: remove unneeded LD_LIBRARY_PATH Alexander V. Tikhonov
2019-12-18 12:49   ` Igor Munkin
2019-12-19  9:27     ` Alexander Tikhonov
2020-04-01  9:57       ` Sergey Bronnikov
2019-12-10 11:21 ` [Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile Alexander V. Tikhonov
2019-12-18 15:01   ` Igor Munkin [this message]
2019-12-19  9:28     ` Alexander Tikhonov
2020-04-01  9:54       ` Sergey Bronnikov
2019-12-10 11:21 ` [Tarantool-patches] [PATCH v2 4/5] static build: added build subdirectory cleanup Alexander V. Tikhonov
2019-12-18 15:34   ` Igor Munkin
2019-12-19  9:28     ` Alexander Tikhonov
2020-04-01  9:54       ` Sergey Bronnikov
2019-12-10 11:21 ` [Tarantool-patches] [PATCH v2 5/5] static build: resolve issues with sourceforge.net Alexander V. Tikhonov
2019-12-18 15:55   ` Igor Munkin
2019-12-19  9:34     ` Alexander Tikhonov
2020-04-01  9:53       ` Sergey Bronnikov
2020-04-01 10:18         ` Alexander Tikhonov
2019-12-18 16:01 ` [Tarantool-patches] [PATCH v2 0/5] Improved the static build based on Dockerfile Igor Munkin
2019-12-19  9:29   ` Alexander Tikhonov
2020-04-02 10:35 ` Kirill Yukhin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191218150120.GT1214@tarantool.org \
    --to=imun@tarantool.org \
    --cc=avtikhon@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox