From 455054c4c25ba43fdc53fc6225e442758b6c247a Mon Sep 17 00:00:00 2001 From: Abdul Dakkak Date: Tue, 1 Aug 2017 09:28:49 -0400 Subject: [PATCH 1/6] add dockerfile for project --- .dockerignore | 1 + Dockerfile | 51 ++++++++++++++++++++++++++++++++++++ cmake/InstallRapidJSON.cmake | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..1d1fe94 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +Dockerfile \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6f40de5 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,51 @@ +FROM gcc:7 +MAINTAINER Abdul Dakkak + +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + automake \ + autoconf \ + bison \ + flex \ + libevent-dev \ + libboost-all-dev \ + libssl-dev \ + libcurl4-openssl-dev \ + libdouble-conversion-dev \ + libgoogle-glog-dev \ + libgflags-dev \ + libjemalloc-dev \ + libssl-dev \ + cmake \ + thrift-compiler && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + + +ENV FOLLY_SRC=/src/folly +RUN git clone https://github.com/facebook/folly $FOLLY_SRC && cd $FOLLY_SRC && git fetch --all +WORKDIR $FOLLY_SRC/folly +RUN autoreconf -ivf && \ + ./configure --prefix=/usr/local && \ + make && \ + make -j`nproc` install + + +ENV LIBRDKAFKA_SRC=/src/librdkafka +RUN git clone https://github.com/edenhill/librdkafka $LIBRDKAFKA_SRC && cd $LIBRDKAFKA_SRC && git fetch --all +WORKDIR $LIBRDKAFKA_SRC +RUN ./configure --prefix=/usr/local && \ + make && \ + make -j`nproc` install + +ENV ZIPKIN_CPP=/src/zipkin-cpp +ENV ZIPKIN_CPP_BUILD=/opt/zipkin-cpp +WORKDIR $ZIPKIN_CPP + +ADD . $ZIPKIN_CPP + +WORKDIR $ZIPKIN_CPP_BUILD + +RUN cmake $ZIPKIN_CPP -DSHARED_LIB=OFF -DBUILD_DOCS=OFF + +# RUN make \ No newline at end of file diff --git a/cmake/InstallRapidJSON.cmake b/cmake/InstallRapidJSON.cmake index cbc3fb3..e649348 100644 --- a/cmake/InstallRapidJSON.cmake +++ b/cmake/InstallRapidJSON.cmake @@ -8,7 +8,7 @@ if (NOT RAPIDJSON_FOUND OR USE_BUNDLED_RAPIDJSON) DOWNLOAD_NAME RapidJSON-${RAPIDJSON_VERSION}.tar.gz URL https://github.com/miloyip/rapidjson/archive/v${RAPIDJSON_VERSION}.tar.gz URL_MD5 ${RAPIDJSON_URL_MD5} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= -DRAPIDJSON_BUILD_EXAMPLES=OFF TEST_COMMAND "" ) From 95bd2ea0cd6bd3cef62577610c287c34d073320b Mon Sep 17 00:00:00 2001 From: Abdul Dakkak Date: Tue, 1 Aug 2017 09:32:41 -0400 Subject: [PATCH 2/6] run make --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f40de5..b1e2fa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,4 +48,4 @@ WORKDIR $ZIPKIN_CPP_BUILD RUN cmake $ZIPKIN_CPP -DSHARED_LIB=OFF -DBUILD_DOCS=OFF -# RUN make \ No newline at end of file +RUN make \ No newline at end of file From eebb00d24cb0a596acdae53c758f21f93cfd4791 Mon Sep 17 00:00:00 2001 From: Abdul Dakkak Date: Tue, 1 Aug 2017 09:41:30 -0400 Subject: [PATCH 3/6] fix typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b1e2fa7..80c4c09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,6 @@ ADD . $ZIPKIN_CPP WORKDIR $ZIPKIN_CPP_BUILD -RUN cmake $ZIPKIN_CPP -DSHARED_LIB=OFF -DBUILD_DOCS=OFF +RUN cmake $ZIPKIN_CPP -DSHARED_LIB=ON -DBUILD_DOCS=OFF RUN make \ No newline at end of file From 178b2e08003dad7b2bd1bf04348997414dbab1c1 Mon Sep 17 00:00:00 2001 From: Abdul Dakkak Date: Tue, 1 Aug 2017 10:37:27 -0400 Subject: [PATCH 4/6] build as a static file --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80c4c09..e8927d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,6 @@ ADD . $ZIPKIN_CPP WORKDIR $ZIPKIN_CPP_BUILD -RUN cmake $ZIPKIN_CPP -DSHARED_LIB=ON -DBUILD_DOCS=OFF +RUN cmake $ZIPKIN_CPP -DBUILD_DOCS=OFF RUN make \ No newline at end of file From 27202389f255c8c28dabf18579b6deafaa4c8669 Mon Sep 17 00:00:00 2001 From: Abdul Dakkak Date: Tue, 1 Aug 2017 10:52:05 -0400 Subject: [PATCH 5/6] compile with curl --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e8927d1..4f6da37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,6 @@ ADD . $ZIPKIN_CPP WORKDIR $ZIPKIN_CPP_BUILD -RUN cmake $ZIPKIN_CPP -DBUILD_DOCS=OFF +RUN cmake $ZIPKIN_CPP -DWITH_CURL=ON -DBUILD_DOCS=OFF RUN make \ No newline at end of file From bb0285f3a0fede373ddea6c089399b85c9afe59d Mon Sep 17 00:00:00 2001 From: Cheng Li Date: Tue, 1 Aug 2017 21:53:15 -0400 Subject: [PATCH 6/6] udpate Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f6da37..3f376f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,7 @@ ADD . $ZIPKIN_CPP WORKDIR $ZIPKIN_CPP_BUILD -RUN cmake $ZIPKIN_CPP -DWITH_CURL=ON -DBUILD_DOCS=OFF +RUN cmake $ZIPKIN_CPP -DWITH_CURL=ON -DBUILD_DOCS=OFF -DWITH_FPIC=ON -RUN make \ No newline at end of file +RUN make && \ + make -j`nproc` install \ No newline at end of file