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-247: Updated docker file.
Date Thu, 09 Jul 2015 12:32:02 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-247_android_support 13d3fec22 -> 9163e76ed


CELIX-247: Updated docker file.

 - Moved building from RUN to CMD to reflect that this is a celix-builder container not a
celix container
 - Added ALv2 comment
 - Added some howto documentation in the DockerFile


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

Branch: refs/heads/feature/CELIX-247_android_support
Commit: 9163e76ed6d7d7dc3afa8838a2bbf6fd379e4bc0
Parents: 13d3fec
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jul 9 14:29:35 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Jul 9 14:29:35 2015 +0200

----------------------------------------------------------------------
 Dockerfile | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/9163e76e/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 1e9f5eb..6f4f1d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,18 @@
-FROM ubuntu:14.04
+#
+# Licensed under Apache License v2. See LICENSE for more information.
+#
+
+# Celix android builder
+# 
+# Howto:
+# Build docker image -> docker build -t celix-android-builder <path-to-this-dockerfile>
+# Run docker image -> docker run --name builder celix-android-builder
+# Extract filesystem -> docker export builder > fs.tar
+# Extract /build dir from tar -> tar xf fs.tar build/output/celix
+#
+#
 
+FROM ubuntu:14.04
 MAINTAINER Bjoern Petri <bjoern.petri@sundevil.de>
 
 ENV ARCH armv7
@@ -91,9 +104,11 @@ RUN curl -L -O http://xmlsoft.org/sources/libxml2-2.7.2.tar.gz &&
\
 	make && make install
 
 
-# finally celix
-
-RUN git clone https://github.com/apache/celix.git --single-branch --branch feature/CELIX-247_android_support
celix && mkdir celix/build && cd celix/build && cmake -DANDROID=TRUE
-DBUILD_EXAMPLES=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_RSA_TOPOLOGY_MANAGER=ON -DJANSSON_LIBRARY=/build/output/jansson/lib/libjansson.a -DJANSSON_INCLUDE_DIR=/build/output/jansson/include
-DCURL_LIBRARY=/build/output/curl/lib/libcurl.a -DCURL_INCLUDE_DIR=/build/output/curl/include
-DLIBXML2_LIBRARIES=/build/output/libxml2/lib/libxml2.a -DLIBXML2_INCLUDE_DIR=/build/output/libxml2/include/libxml2
-DZLIB_LIBRARY=/build/output/zlib/lib/libz.a -DZLIB_INCLUDE_DIR=/build/output/zlib/include
-DUUID_LIBRARY=/build/output/uuid/lib/libuuid.a -DUUID_INCLUDE_DIR=/build/output/uuid/include
-DCMAKE_INSTALL_PREFIX:PATH=/build/output/celix .. && make && make install

+# finally add celix src
+ADD . celix
+#Or do git clone -> RUN git clone https://github.com/apache/celix.git celix
 
+CMD mkdir -p celix/build-android && cd celix/build-android && cmake -DANDROID=TRUE
-DBUILD_EXAMPLES=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON -DBUILD_REMOTE_SHELL=ON -DBUILD_RSA_DISCOVERY_CONFIGURED=ON
-DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_RSA_TOPOLOGY_MANAGER=ON -DJANSSON_LIBRARY=/build/output/jansson/lib/libjansson.a -DJANSSON_INCLUDE_DIR=/build/output/jansson/include
-DCURL_LIBRARY=/build/output/curl/lib/libcurl.a -DCURL_INCLUDE_DIR=/build/output/curl/include
-DLIBXML2_LIBRARIES=/build/output/libxml2/lib/libxml2.a -DLIBXML2_INCLUDE_DIR=/build/output/libxml2/include/libxml2
-DZLIB_LIBRARY=/build/output/zlib/lib/libz.a -DZLIB_INCLUDE_DIR=/build/output/zlib/include
-DUUID_LIBRARY=/build/output/uuid/lib/libuuid.a -DUUID_INCLUDE_DIR=/build/output/uuid/include
-DCMAKE_INSTALL_PREFIX:PATH=/build/output/celix .. && make && make install-all
 
 # done
+


Mime
View raw message