You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by ra...@apache.org on 2019/09/26 19:52:33 UTC
[incubator-marvin] 01/01: changes to prevent unnecessary engine
executor download. re #MARVIN-68
This is an automated email from the ASF dual-hosted git repository.
rafaelnovello pushed a commit to branch MARVIN-68
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit bb374d6320176cdeeb3a49e85cbd95a233b5d53a
Author: Rafael Novello <ra...@lendico.com.br>
AuthorDate: Thu Sep 26 16:51:42 2019 -0300
changes to prevent unnecessary engine executor download. re #MARVIN-68
---
.../management/templates/python-engine/Dockerfile | 4 ++--
.../marvin_python_toolbox/management/templates/python-engine/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
index 08deb81..1f4e88e 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Dockerfile
@@ -102,7 +102,7 @@ RUN /bin/bash -c "cd $MARVIN_ENGINE_HOME && \
ADD build/engine.tar $MARVIN_ENGINE_HOME
-ADD build/marvin-engine-executor-assembly.jar $MARVIN_DATA_PATH
+ADD build/*.jar $MARVIN_DATA_PATH
RUN /bin/bash -c "source /usr/local/bin/virtualenvwrapper.sh && \
workon $MARVIN_ENGINE_ENV && \
@@ -119,4 +119,4 @@ EXPOSE 8000
CMD /bin/bash -c "source /usr/local/bin/virtualenvwrapper.sh && \
workon $MARVIN_ENGINE_ENV && \
cd $MARVIN_ENGINE_HOME && \
- marvin engine-httpserver -h 0.0.0.0 -p 8000"
\ No newline at end of file
+ marvin engine-httpserver -h 0.0.0.0 -p 8000"
diff --git a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
index e734143..8cd6685 100644
--- a/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
+++ b/python-toolbox/marvin_python_toolbox/management/templates/python-engine/Makefile
@@ -66,11 +66,11 @@ clean: clean-build clean-pyc clean-reports clean-deps
docker-build: clean-build
mkdir -p build
tar -cf build/engine.tar --exclude=*.log --exclude=*.pkl --exclude='build' --exclude='notebooks' --exclude=*.tar *
- cp -f $(MARVIN_DATA_PATH)/marvin-engine-executor-assembly-$(MARVIN_TOOLBOX_VERSION).jar build/marvin-engine-executor-assembly.jar
+ cp -f $(MARVIN_DATA_PATH)/marvin-engine-executor-assembly-$(MARVIN_TOOLBOX_VERSION).jar build/
sudo docker build -t $(DOCKER_REGISTRY_ADRESS)/$(MARVIN_ENGINE_NAME):$(DOCKER_VERSION) .
docker-run:
sudo docker run --name=marvin-$(MARVIN_ENGINE_NAME)-$(DOCKER_VERSION) --mount type=bind,source=$(MARVIN_DATA_PATH),destination=/marvin-data -p 8000:8000 $(DOCKER_REGISTRY_ADRESS)/$(MARVIN_ENGINE_NAME):$(DOCKER_VERSION)
docker-push:
- sudo docker push $(DOCKER_REGISTRY_ADRESS)/$(MARVIN_ENGINE_NAME):$(DOCKER_VERSION)
\ No newline at end of file
+ sudo docker push $(DOCKER_REGISTRY_ADRESS)/$(MARVIN_ENGINE_NAME):$(DOCKER_VERSION)