Skip to content

Commit

Permalink
build: static build needs more cleanup in sources
Browse files Browse the repository at this point in the history
Building Tarantool sources on make command run may fail with:

  [ 10%] make[2]: *** [test/small] Error 1
  [ 10%] make[1]: *** [test/CMakeFiles/symlink_small_tests.dir/all] Error 2
  make[1]: *** Waiting for unfinished jobs....

The root cause of the issue that Dockerfile.staticbuild
uses local copy of sources:

  COPY . /tarantool

Which may have broken links in tests, like:

  $ ls -al test
  ...
  luajit-tap -> /<wrong path>/third_party/luajit/test
  small -> /<wrong path>/src/lib/small/test/
  ...

To fix the issue this links should be removed from
the docker local copy of sources before build, like:

  rm -rf test/small test/luajit-tap

Closes #5025

(cherry picked from commit b74a462)
  • Loading branch information
avtikhon authored and kyukhin committed Jul 3, 2020
1 parent c47eb4d commit ae9ad0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile.staticbuild
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN set -x && \
RUN set -x && \
find . -name 'CMakeFiles' -type d -exec rm -rf {} + && \
find . -name 'CMakeCache.txt' -type f -delete && \
rm -rf build
rm -rf build test/small test/luajit-tap

RUN pip install -r /tarantool/test-run/requirements.txt

Expand Down

0 comments on commit ae9ad0c

Please sign in to comment.