MINIFICPP-1049 - Fix make docker
Signed-off-by: Arpad Boda <aboda@apache.org>
This closes #655
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 "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 @@
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 @@
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}