You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/12/15 10:26:34 UTC

marmotta git commit: MARMOTTA-621: fixed wrong merge

Repository: marmotta
Updated Branches:
  refs/heads/develop d6ad3432e -> 63f425f4a


MARMOTTA-621: fixed wrong merge


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

Branch: refs/heads/develop
Commit: 63f425f4ac7ce63fed128358a88267bd3db692d0
Parents: d6ad343
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Dec 15 10:08:06 2015 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Dec 15 10:08:06 2015 +0100

----------------------------------------------------------------------
 libraries/ostrich/backend/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/63f425f4/libraries/ostrich/backend/Dockerfile
----------------------------------------------------------------------
diff --git a/libraries/ostrich/backend/Dockerfile b/libraries/ostrich/backend/Dockerfile
index e102dae..bca988f 100644
--- a/libraries/ostrich/backend/Dockerfile
+++ b/libraries/ostrich/backend/Dockerfile
@@ -39,7 +39,6 @@ RUN apt-get update -qq \
         libgflags-dev \
         libgtest-dev \
         libboost-all-dev \
-        libtcmalloc-minimal4 \
         libgoogle-perftools-dev
 
 RUN git clone https://github.com/grpc/grpc.git \
@@ -55,7 +54,7 @@ RUN git clone https://github.com/grpc/grpc.git \
 # build
 RUN mkdir build \
     && cd build \
-    && cmake .. \
+    && cmake -D CMAKE_BUILD_TYPE=Release .. \
     && make \
     && cd ..