MINIFICPP-390 Remove files generated from host so they will be generated in Docker environment
This closes #255. Signed-off-by: Marc Parisi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/ee00393e Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/ee00393e Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/ee00393e Branch: refs/heads/master Commit: ee00393ec794a739132843ebbb53a611e15695be Parents: ccbfd3a Author: Andrew I. Christianson <[email protected]> Authored: Wed Jan 31 13:48:27 2018 -0500 Committer: Marc Parisi <[email protected]> Committed: Thu Feb 1 13:50:57 2018 -0500 ---------------------------------------------------------------------- docker/DockerBuild.sh | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/ee00393e/docker/DockerBuild.sh ---------------------------------------------------------------------- diff --git a/docker/DockerBuild.sh b/docker/DockerBuild.sh index 624f22d..f606544 100755 --- a/docker/DockerBuild.sh +++ b/docker/DockerBuild.sh @@ -48,6 +48,9 @@ cp -r $CMAKE_SOURCE_DIR/LICENSE $CMAKE_SOURCE_DIR/docker/minificppsource/. cp -r $CMAKE_SOURCE_DIR/NOTICE $CMAKE_SOURCE_DIR/docker/minificppsource/. cp -r $CMAKE_SOURCE_DIR/README.md $CMAKE_SOURCE_DIR/docker/minificppsource/. +# Don't use EL files generated for the host +rm -f $CMAKE_SOURCE_DIR/docker/minificppsource/extensions/expression-language/{*.hh,Parser.hpp,Scanner.cpp,Parser.cpp,Scanner.h} + DOCKER_COMMAND="docker build --build-arg UID=$UID_ARG --build-arg GID=$GID_ARG --build-arg MINIFI_VERSION=$MINIFI_VERSION --build-arg MINIFI_SOURCE_CODE=$MINIFI_SOURCE_CODE -t apacheminificpp:$MINIFI_VERSION ." echo "Docker Command: '$DOCKER_COMMAND'" ${DOCKER_COMMAND}
