[nifi-minifi-cpp] branch master updated: MINIFICPP-1049 - Fix make docker

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new b95fc10  MINIFICPP-1049 - Fix make docker
b95fc10 is described below

commit b95fc10b8e647f984101095fcb3f4e0153d97185
Author: Daniel Bakai <ba...@gmail.com>
AuthorDate: Mon Sep 30 20:54:49 2019 +0200

    MINIFICPP-1049 - Fix make docker
    
    Signed-off-by: Arpad Boda <ab...@apache.org>
    
    This closes #655
---
 docker/DockerBuild.sh | 5 ++++-
 docker/Dockerfile     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/DockerBuild.sh b/docker/DockerBuild.sh
index 6217a82..8e8e3d6 100755
--- a/docker/DockerBuild.sh
+++ b/docker/DockerBuild.sh
@@ -31,12 +31,13 @@ echo "CMake Source Directory: $CMAKE_SOURCE_DIR"
 echo "MiNiFi Package: $MINIFI_SOURCE_CODE"
 
 # Copy the MiNiFi source tree to the Docker working directory before building
+rm -rf $CMAKE_SOURCE_DIR/docker/minificppsource
 mkdir -p $CMAKE_SOURCE_DIR/docker/minificppsource
 rsync -avr \
       --exclude '/*build*' \
       --exclude '/*_repository*' \
       --exclude '/logs' \
-      --exclude '/cmake' \
+      --exclude '/cmake-build-*' \
       --exclude '/docker' \
       --exclude '.git' \
       --exclude '/extensions/expression-language/Parser.cpp' \
@@ -57,3 +58,5 @@ DOCKER_COMMAND="docker build --build-arg UID=$UID_ARG \
                              apacheminificpp:$MINIFI_VERSION ."
 echo "Docker Command: '$DOCKER_COMMAND'"
 ${DOCKER_COMMAND}
+
+rm -rf $CMAKE_SOURCE_DIR/docker/minificppsource
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7b61c0c..38bcaf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -76,7 +76,7 @@ ENV MINIFI_HOME $MINIFI_BASE_DIR/nifi-minifi-cpp-${MINIFI_VERSION}
 RUN cd ${MINIFI_BASE_DIR} \
 	&& mkdir build \
 	&& cd build \
-	&& cmake -DOPENSSL_FORCE_SHARED=true -DDISABLE_JEMALLOC=ON -DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_JNI=ON .. \
+	&& cmake -DDISABLE_JEMALLOC=ON -DSTATIC_BUILD= -DSKIP_TESTS=true -DENABLE_JNI=ON .. \
 	&& make -j8 package \
 	&& tar -xzvf ${MINIFI_BASE_DIR}/build/nifi-minifi-cpp-${MINIFI_VERSION}-bin.tar.gz -C ${MINIFI_BASE_DIR}