Updates docker create fs script to that the some minimal needed host libs are added
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/7bf5886e Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/7bf5886e Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/7bf5886e Branch: refs/heads/master Commit: 7bf5886e4540901f5c5234eb416ad2a7825c5fd3 Parents: 462d679 Author: Pepijn Noltes <[email protected]> Authored: Fri Dec 22 13:38:53 2017 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Fri Dec 22 13:38:53 2017 +0100 ---------------------------------------------------------------------- cmake/cmake_celix/create_target_filesystem.sh | 3 +-- examples/dm_example/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/7bf5886e/cmake/cmake_celix/create_target_filesystem.sh ---------------------------------------------------------------------- diff --git a/cmake/cmake_celix/create_target_filesystem.sh b/cmake/cmake_celix/create_target_filesystem.sh index 611b590..f5ec542 100644 --- a/cmake/cmake_celix/create_target_filesystem.sh +++ b/cmake/cmake_celix/create_target_filesystem.sh @@ -211,5 +211,4 @@ ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin nobody:x:99:99:Nobody:/:/sbin/nologin""" > etc/passwd fi -#Currently done by libcelix_docker_dummy.so -#celix_add_required_libs +celix_add_required_libs http://git-wip-us.apache.org/repos/asf/celix/blob/7bf5886e/examples/dm_example/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/examples/dm_example/CMakeLists.txt b/examples/dm_example/CMakeLists.txt index f10ef26..fa6ec57 100644 --- a/examples/dm_example/CMakeLists.txt +++ b/examples/dm_example/CMakeLists.txt @@ -62,5 +62,6 @@ if (BUILD_DEPENDENCY_MANAGER) PROPERTIES LOGHELPER_ENABLE_STDOUT_FALLBACK=true ) + add_dependencies(celix-build-dm_exmpl-docker-image celix-build-dm_exmpl_base-docker-image) endif ()
