You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2018/10/01 08:25:03 UTC
celix git commit: CELIX-434: Adds default cache dir configuration to
add_celix_docker_container
Repository: celix
Updated Branches:
refs/heads/feature/CELIX-454-pubsub-disc 436f84d06 -> b29bb915f
CELIX-434: Adds default cache dir configuration to add_celix_docker_container
This ways all docker container use the same cache dir (.cache)
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b29bb915
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b29bb915
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b29bb915
Branch: refs/heads/feature/CELIX-454-pubsub-disc
Commit: b29bb915f1fb0df89734d3ff7bb2ddf184677765
Parents: 436f84d
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Oct 1 10:23:37 2018 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Oct 1 10:24:48 2018 +0200
----------------------------------------------------------------------
cmake/cmake_celix/DockerPackaging.cmake | 1 +
examples/celix-examples/dm_example_cxx/CMakeLists.txt | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/b29bb915/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 386ede0..cdc46c9 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -198,6 +198,7 @@ CELIX_AUTO_START_3=$<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_BUNDLES_LEVE
CELIX_AUTO_START_4=$<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_BUNDLES_LEVEL_4>, >
CELIX_AUTO_START_5=$<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_BUNDLES_LEVEL_5>, >
CELIX_CONTAINER_NAME=$<TARGET_PROPERTY:${DOCKER_TARGET},CONTAINER_NAME>
+org.osgi.framework.storage=.cache
$<JOIN:$<TARGET_PROPERTY:${DOCKER_TARGET},DOCKER_PROPERTIES>,
>
"
http://git-wip-us.apache.org/repos/asf/celix/blob/b29bb915/examples/celix-examples/dm_example_cxx/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/celix-examples/dm_example_cxx/CMakeLists.txt b/examples/celix-examples/dm_example_cxx/CMakeLists.txt
index ef40d25..17e4192 100644
--- a/examples/celix-examples/dm_example_cxx/CMakeLists.txt
+++ b/examples/celix-examples/dm_example_cxx/CMakeLists.txt
@@ -42,6 +42,7 @@ add_celix_container("dm_example_cxx"
add_celix_docker(dm_exmpl_cxx_docker
+ CXX
IMAGE_NAME dm_exmpl_cxx
GROUP examples
BUNDLES_DIR /usr/share/bundles