This is an automated email from the ASF dual-hosted git repository.
weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git
commit 7f708a23a23c6ce631f5fe8674042a5026f0710e
Author: cardosolucas <cardosolucas61....@gmail.com>
AuthorDate: Wed Aug 26 17:41:27 2020 -0300
Change build folder to build daemon docker image
---
Makefile | 36 +++++++++---------------------
build/daemon/Dockerfile | 8 +++++++
build/marvin-engine-executor-assembly.jar | Bin 94184375 -> 0 bytes
build/python-toolbox.tgz | Bin 693248 -> 0 bytes
4 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
index f0a548c..67333f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -14,36 +13,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-.PHONY: help docker-base docker-python docker-r toolbox engine-server
+.PHONY: help python-daemon-base engine-server python-daemon
help:
- @echo " docker-base"
- @echo " Builds the base docker image with common dependecies
among languages."
- @echo " docker-python"
+ @echo " python-daemon-base"
@echo " Builds a docker image that can run engines in Python."
- @echo " docker-r"
- @echo " Builds a docker image that can run engines in R."
- @echo " toolbox"
- @echo " Builds the toolbox and make it available for be included
into docker images."
+ @echo " python-daemon"
+ @echo " Builds the python-daemon and make it available for be
included into docker images."
@echo " engine-server"
@echo " Builds a jar with the engine interpreter server."
-docker-base:
- docker build -t marvin-base -f engine-server/build/Dockerfile
engine-server/build
-
-docker-python:
- $(MAKE) engine-server
- $(MAKE) toolbox
- docker build -t marvin-python -f
engine-server/build/docker-python/Dockerfile engine-server/build
-
-docker-r:
- $(MAKE) engine-server
- $(MAKE) toolbox
- docker build -t marvin-r -f engine-server/build/docker-r/Dockerfile
engine-server/build
+python-daemon-base:
+ $(MAKE) python-daemon
+ docker build -t marvin-daemon:python -f build/daemon/Dockerfile
build/daemon
engine-server:
- cd engine-server && $(MAKE) package
- mv engine-server/target/scala-2.12/marvin-engine-server-assembly-*.jar
engine-server/build/marvin-engine-server-assembly.jar
+ cd engine-executor && $(MAKE) package
+ mv
engine-executor/target/scala-2.12/marvin-engine-executor-assembly-*.jar
build/executor/marvin-engine-executor-assembly.jar
-toolbox:
- tar -cf engine-server/build/python-toolbox.tgz python-toolbox
\ No newline at end of file
+python-daemon:
+ tar -zcvf build/daemon/python-daemon.tar.gz python-daemon
\ No newline at end of file
diff --git a/build/daemon/Dockerfile b/build/daemon/Dockerfile
new file mode 100644
index 0000000..1154b3d
--- /dev/null
+++ b/build/daemon/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.7-buster
+
+ADD python-daemon.tar.gz .
+RUN /bin/bash -c "apt update && apt install libsasl2-dev graphviz -y" \
+&& /bin/bash -c "cd python-daemon && pip install ." \
+&& rm -rf python-daemon \
+&& apt-get clean \
+&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /root/.cache/*
\ No newline at end of file
diff --git a/build/marvin-engine-executor-assembly.jar
b/build/marvin-engine-executor-assembly.jar
deleted file mode 100644
index ff8a8f4..0000000
Binary files a/build/marvin-engine-executor-assembly.jar and /dev/null differ
diff --git a/build/python-toolbox.tgz b/build/python-toolbox.tgz
deleted file mode 100644
index 86b60d1..0000000
Binary files a/build/python-toolbox.tgz and /dev/null differ
