[Tarantool-patches] [PATCH v2 3/5] static build: cleanup Dockerfile

[Sergey Bronnikov]

LGTM

On 12:28 Thu 19 Dec , Alexander Tikhonov wrote:
> Igor, thanks for the review, I've made comment correction as you suggested
> and added the link into the comment.
> 
> 
> >Среда, 18 декабря 2019, 18:03 +03:00 от Igor Munkin <imun at 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
> 
> 
> -- 
> Alexander Tikhonov

-- 
sergeyb@