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 2017/03/13 19:23:40 UTC
celix git commit: CELIX-401: Adds libstd++ as dependency for the
celix-base docker image
Repository: celix
Updated Branches:
refs/heads/develop 9259626d4 -> 4b760987a
CELIX-401: Adds libstd++ as dependency for the celix-base docker image
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/4b760987
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/4b760987
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/4b760987
Branch: refs/heads/develop
Commit: 4b760987ae7cd9bfb98ea636bee5f2d82e74ed9c
Parents: 9259626
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Mon Mar 13 20:22:49 2017 +0100
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Mon Mar 13 20:22:49 2017 +0100
----------------------------------------------------------------------
cmake/cmake_celix/DockerPackaging.cmake | 4 +++-
docker/celix-builder/Dockerfile | 6 +++---
docker/celix-builder/libdeps/CMakeLists.txt | 4 ++--
docker/celix-builder/libdeps/main.c | 2 --
docker/celix-builder/libdeps/main.cc | 2 ++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/4b760987/cmake/cmake_celix/DockerPackaging.cmake
----------------------------------------------------------------------
diff --git a/cmake/cmake_celix/DockerPackaging.cmake b/cmake/cmake_celix/DockerPackaging.cmake
index 8ad98a0..70bb407 100644
--- a/cmake/cmake_celix/DockerPackaging.cmake
+++ b/cmake/cmake_celix/DockerPackaging.cmake
@@ -18,6 +18,8 @@
add_custom_target(dockerfiles)
add_custom_target(dockerimages)
+set(DOCKER_CMD "docker" CACHE STRING "Docker command to use.")
+
function(add_docker_for_all_deployments)
#NOTE that this function must be called after all CMake add_deploy commands are executed.
@@ -87,7 +89,7 @@ $<JOIN:$<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_DOCKERFILE_INSTRUCTIONS>,
set_target_properties(dockerfiles PROPERTIES "DOCKER_FILES_DEPS" "${DEPS}")
add_custom_target(${DEPLOY_TARGET}-dockerimage
- COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_LOCATION> docker build -t "$<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_DOCKERFILE_IMAGE_NAME>" .
+ COMMAND ${CMAKE_COMMAND} -E chdir $<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_LOCATION> ${DOCKER_CMD} build -t "$<TARGET_PROPERTY:${DEPLOY_TARGET},DEPLOY_DOCKERFILE_IMAGE_NAME>" .
DEPENDS ${DOCKERFILE} ${DEPLOY_TARGET}
COMMENT "Creating docker image for deployment '${DEPLOY_TARGET}'" VERBATIM
)
http://git-wip-us.apache.org/repos/asf/celix/blob/4b760987/docker/celix-builder/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/celix-builder/Dockerfile b/docker/celix-builder/Dockerfile
index d09c235..7de3bf1 100644
--- a/docker/celix-builder/Dockerfile
+++ b/docker/celix-builder/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM fedora:23
+FROM fedora:25
#Install required libs for building, docker, python and dokerize
RUN dnf group install -y "C Development Tools and Libraries"
@@ -30,14 +30,14 @@ RUN dnf -y install \
libffi-devel \
libxml2-devel \
libuuid-devel \
- python3 \
+ python2 \
gdb-gdbserver
#jdk installed for jar command
RUN dnf install -y java-1.8.0-openjdk-devel
#dockerize will be used to extract a single executable with required deps
-RUN pip install dockerize
+RUN pip2 install dockerize
#Building and installing celix
ADD . /root/celix
http://git-wip-us.apache.org/repos/asf/celix/blob/4b760987/docker/celix-builder/libdeps/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/docker/celix-builder/libdeps/CMakeLists.txt b/docker/celix-builder/libdeps/CMakeLists.txt
index fdf9350..fcbf216 100644
--- a/docker/celix-builder/libdeps/CMakeLists.txt
+++ b/docker/celix-builder/libdeps/CMakeLists.txt
@@ -1,11 +1,11 @@
-project(Dummy C)
+project(Dummy CXX)
cmake_minimum_required(VERSION 3.3)
find_package(PkgConfig REQUIRED)
pkg_check_modules(JANSSON REQUIRED jansson)
add_executable(dummy
- main.c
+ main.cc
)
target_link_libraries(dummy ${JANSSON_LIBRARIES} gcc_s)
http://git-wip-us.apache.org/repos/asf/celix/blob/4b760987/docker/celix-builder/libdeps/main.c
----------------------------------------------------------------------
diff --git a/docker/celix-builder/libdeps/main.c b/docker/celix-builder/libdeps/main.c
deleted file mode 100644
index b2f9976..0000000
--- a/docker/celix-builder/libdeps/main.c
+++ /dev/null
@@ -1,2 +0,0 @@
-int main() {
-}
http://git-wip-us.apache.org/repos/asf/celix/blob/4b760987/docker/celix-builder/libdeps/main.cc
----------------------------------------------------------------------
diff --git a/docker/celix-builder/libdeps/main.cc b/docker/celix-builder/libdeps/main.cc
new file mode 100644
index 0000000..b2f9976
--- /dev/null
+++ b/docker/celix-builder/libdeps/main.cc
@@ -0,0 +1,2 @@
+int main() {
+}