celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-401: Some small fixes.
Date Tue, 21 Feb 2017 14:12:26 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 7e71402c7 -> cd0164c72


CELIX-401: Some small fixes.


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/cd0164c7
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/cd0164c7
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/cd0164c7

Branch: refs/heads/develop
Commit: cd0164c72aade921dd8e09a360dd6bc01f7a7dee
Parents: 7e71402
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Feb 21 15:11:56 2017 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Feb 21 15:11:56 2017 +0100

----------------------------------------------------------------------
 cmake/CMakeCelix.cmake                  | 14 +++++++-------
 cmake/cmake_celix/DockerPackaging.cmake |  2 +-
 docker/celix-builder/README.md          |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/cd0164c7/cmake/CMakeCelix.cmake
----------------------------------------------------------------------
diff --git a/cmake/CMakeCelix.cmake b/cmake/CMakeCelix.cmake
index afcad36..9ca4de7 100644
--- a/cmake/CMakeCelix.cmake
+++ b/cmake/CMakeCelix.cmake
@@ -22,10 +22,10 @@ if (ANDROID)
 	add_definitions( -DANDROID )
 endif ()
 
-include(cmake_celix/Dependencies)
-include(cmake_celix/BundlePackaging)
-include(cmake_celix/DeployPackaging)
-include(cmake_celix/DockerPackaging)
-include(cmake_celix/ApacheRat)
-include(cmake_celix/CodeCoverage)
-include(cmake_celix/BuildOptions)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/Dependencies.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/BundlePackaging.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/DeployPackaging.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/DockerPackaging.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/ApacheRat.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/CodeCoverage.cmake)
+include(${CELIX_CMAKE_DIRECTORY}/cmake_celix/BuildOptions.cmake)

http://git-wip-us.apache.org/repos/asf/celix/blob/cd0164c7/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 7881062..8ad98a0 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -71,7 +71,7 @@ function(deploy_docker)
             CONTENT "# Dockerfile for inaetics/celix-node-agent-service
 FROM $<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_DOCKERFILE_FROM>
 
-#set standalone env
+#set image name env
 ENV IMAGE_NAME $<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_DOCKERFILE_IMAGE_NAME>
 
 #add bundles, properties and set workdir

http://git-wip-us.apache.org/repos/asf/celix/blob/cd0164c7/docker/celix-builder/README.md
----------------------------------------------------------------------
diff --git a/docker/celix-builder/README.md b/docker/celix-builder/README.md
index e829dd4..8af3b1e 100644
--- a/docker/celix-builder/README.md
+++ b/docker/celix-builder/README.md
@@ -17,7 +17,7 @@ Run (in the Celix root src dir):
  - `docker build -t celix-base .`
 
 
-# How to create a docker image using Celix
+# How to create a celix based docker image 
 
 Run (in the Celix root src dir):
  - `mkdir build`


Mime
View raw message