<HTML><BODY><div>Oleg, thanks for the patch, LGTM.<br><br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Вторник, 21 апреля 2020, 15:39 +03:00 от Олег Пискунов <o.piskunov@corp.mail.ru>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15874727562023378624_BODY"><div class="class_1587517946"><div><div><br>Fix docker image for perf testing:<br>- Disable caching for second stage docker file creation<br> for correct Tarantool and bench-run version checkout.<br>- bench-run repository creation moved from dockerfile<br> of the first stage to the second.</div><div> </div><div>Close #4870<br>---</div><div> </div><div>Github: <a href="https://github.com/tarantool/bench-run/tree/opiskunov/gh-4870-refactor-docker-perf" target="_blank">https://github.com/tarantool/bench-run/tree/opiskunov/gh-4870-refactor-docker-perf</a><br>Issue: <a href="https://github.com/tarantool/tarantool/issues/4870" target="_blank">https://github.com/tarantool/tarantool/issues/4870</a></div><div> </div><div> dockerfiles/ubuntu_benchs | 3 ---<br> dockerfiles/ubuntu_tnt | 3 +++<br> targets.mk | 2 +-<br> 3 files changed, 4 insertions(+), 4 deletions(-)</div><div> </div><div>diff --git a/dockerfiles/ubuntu_benchs b/dockerfiles/ubuntu_benchs<br>index fd9acb4..f5389f4 100644<br>--- a/dockerfiles/ubuntu_benchs<br>+++ b/dockerfiles/ubuntu_benchs<br>@@ -70,6 +70,3 @@ WORKDIR /opt/linkbench<br> RUN luarocks install \<br> <a href="https://raw.githubusercontent.com/tarantool/gperftools/master/rockspecs/gperftools-scm-1.rockspec" target="_blank">https://raw.githubusercontent.com/tarantool/gperftools/master/rockspecs/gperftools-scm-1.rockspec</a> \<br> --local >build.log 2>&1 || ( cat build.log && false )<br>-<br>-# benchmarks runners<br>-RUN git clone <a href="https://github.com/tarantool/bench-run.git" target="_blank">https://github.com/tarantool/bench-run.git</a> /opt/bench-run<br>diff --git a/dockerfiles/ubuntu_tnt b/dockerfiles/ubuntu_tnt<br>index 361e9d6..1704508 100644<br>--- a/dockerfiles/ubuntu_tnt<br>+++ b/dockerfiles/ubuntu_tnt<br>@@ -8,6 +8,9 @@ RUN ( cmake . -DENABLE_DIST=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo >build.log 2>&1<br> && make -j >>build.log 2>&1 && make install >>build.log 2>&1 ) || \<br> ( cat build.log && false )</div><div> </div><div>+# benchmarks runners<br>+RUN git clone <a href="https://github.com/tarantool/bench-run.git" target="_blank">https://github.com/tarantool/bench-run.git</a> /opt/bench-run<br>+<br> # cbench<br> RUN git clone <a href="https://github.com/tarantool/cbench.git" target="_blank">https://github.com/tarantool/cbench.git</a> /opt/cbench<br> WORKDIR /opt/cbench<br>diff --git a/targets.mk b/targets.mk<br>index 6cf36b6..581b722 100644<br>--- a/targets.mk<br>+++ b/targets.mk<br>@@ -21,7 +21,7 @@ prepare:<br> docker push ${IMAGE_PERF}<br> # build Tarantool and benchmarks with depends on Tarantool sources<br> ${DOCKERFILE_BUILD} --build-arg image_from=${IMAGE_PERF} \<br>- -t ${IMAGE_PERF_BUILT} -f bench-run/dockerfiles/ubuntu_tnt .<br>+ -t ${IMAGE_PERF_BUILT} --no-cache -f bench-run/dockerfiles/ubuntu_tnt .<br> docker push ${IMAGE_PERF_BUILT}</div><div> </div><div> # #####################################################<br>--<br>1.8.3.1</div><div> </div></div></div></div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Alexander Tikhonov</div></div></div><div> </div></div></BODY></HTML>