You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by yi...@apache.org on 2019/05/20 13:01:38 UTC

[incubator-marvin] 01/01: Merge pull request #21 from apache/feature/MARVIN-1

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

yifeizhang pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git

commit 0ba44e482994a03e94f8a09c8479b9253b7c60f4
Merge: f928d0d d5ac4db
Author: Yifei Zhang <yi...@gmail.com>
AuthorDate: Mon May 20 10:01:33 2019 -0300

    Merge pull request #21 from apache/feature/MARVIN-1
    
    Adding support for building docker images.

 .travis.yml                                        |   2 +-
 Makefile                                           |  49 ++++++++++++
 .../.github/ISSUE_TEMPLATE/bug_report.md           |   0
 .../.github/ISSUE_TEMPLATE/custom.md               |   0
 .../.github/ISSUE_TEMPLATE/feature_request.md      |   0
 {engine-executor => engine-server}/.gitignore      |   0
 .../CODE_OF_CONDUCT.md                             |   0
 {engine-executor => engine-server}/Makefile        |   0
 {engine-executor => engine-server}/NOTICE          |   0
 .../PULL_REQUEST_TEMPLATE.md                       |   0
 {engine-executor => engine-server}/README.md       |   0
 {engine-executor => engine-server}/build.sbt       |   2 +-
 engine-server/build/Dockerfile                     |  89 +++++++++++++++++++++
 engine-server/build/docker-python/Dockerfile       |  59 ++++++++++++++
 engine-server/build/docker-r/Dockerfile            |  61 ++++++++++++++
 .../build/marvin-engine-server-assembly.jar        | Bin 0 -> 94184375 bytes
 engine-server/build/python-toolbox.tgz             | Bin 0 -> 693248 bytes
 .../project/assembly.sbt                           |   0
 .../project/build.properties                       |   0
 .../project/plugins.sbt                            |   0
 .../project/scalapb.sbt                            |   0
 {engine-executor => engine-server}/sonatype.sbt    |   0
 .../src/main/protobuf/actions.proto                |   0
 .../src/main}/resources/EngineActionSchema.json    |   0
 .../src/main}/resources/EngineMetadataSchema.json  |   0
 .../src/main/resources/application.conf            |   0
 .../src/main/resources/docs/favicon-16x16.png      | Bin
 .../src/main/resources/docs/favicon-32x32.png      | Bin
 .../src/main/resources/docs/index.html             |   0
 .../src/main/resources/docs/oauth2-redirect.html   |   0
 .../src/main/resources/docs/swagger-ui-bundle.js   |   0
 .../main/resources/docs/swagger-ui-bundle.js.map   |   0
 .../resources/docs/swagger-ui-standalone-preset.js |   0
 .../docs/swagger-ui-standalone-preset.js.map       |   0
 .../src/main/resources/docs/swagger-ui.css         |   0
 .../src/main/resources/docs/swagger-ui.css.map     |   0
 .../src/main/resources/docs/swagger-ui.js          |   0
 .../src/main/resources/docs/swagger-ui.js.map      |   0
 .../src/main/resources/log4j.properties            |   0
 .../marvin/artifact/manager/ArtifactFSSaver.scala  |   0
 .../artifact/manager/ArtifactHdfsSaver.scala       |   0
 .../marvin/artifact/manager/ArtifactS3Saver.scala  |   0
 .../marvin/artifact/manager/ArtifactSaver.scala    |   0
 .../exception/MarvinEExecutorException.scala       |   0
 .../org/marvin/executor/EngineExecutorApp.scala    |   0
 .../org/marvin/executor/actions/BatchAction.scala  |   0
 .../org/marvin/executor/actions/OnlineAction.scala |   0
 .../marvin/executor/actions/PipelineAction.scala   |   0
 .../scala/org/marvin/executor/api/GenericAPI.scala |   0
 .../marvin/executor/api/GenericAPIHandlers.scala   |   0
 .../executor/manager/ExecutorClusterListener.scala |   0
 .../marvin/executor/manager/ExecutorManager.scala  |   0
 .../marvin/executor/proxies/BatchActionProxy.scala |   0
 .../org/marvin/executor/proxies/EngineProxy.scala  |   0
 .../executor/proxies/OnlineActionProxy.scala       |   0
 .../executor/statemachine/PredictorFSM.scala       |   0
 .../scala/org/marvin/model/BatchExecution.scala    |   0
 .../src/main/scala/org/marvin/model/Metadata.scala |   0
 .../org/marvin/util/ConfigurationContext.scala     |   0
 .../src/main/scala/org/marvin/util/JsonUtil.scala  |   0
 .../main/scala/org/marvin/util/LocalCache.scala    |   0
 .../main/scala/org/marvin/util/ProtocolUtil.scala  |   0
 .../src/test}/resources/EngineActionSchema.json    |   0
 .../src/test}/resources/EngineMetadataSchema.json  |   0
 .../src/test/resources/application.conf            |   0
 .../src/test/resources/engine_home/docs.yaml       |   0
 .../src/test/resources/engine_home/engine.metadata |   0
 .../src/test/resources/engine_home/engine.params   |   0
 .../resources/engine_home/predictor-message.schema |   0
 .../src/test/resources/metadataToValidate.json     |   0
 .../resources/metadataToValidateWithError.json     |   0
 .../resources/metadataToValidateWithRefError.json  |   0
 .../src/test/resources/test-invalid.json           |   0
 .../src/test/resources/test.json                   |   0
 .../artifact/manager/ArtifactS3SaverTest.scala     |   0
 .../artifact/manager/ArtifactSaverTest.scala       |   0
 .../marvin/executor/EngineExecutorAppTest.scala    |   0
 .../marvin/executor/actions/BatchActionTest.scala  |   0
 .../marvin/executor/actions/OnlineActionTest.scala |   0
 .../org/marvin/executor/api/GenericAPITest.scala   |   0
 .../executor/manager/ExecutorManagerTest.scala     |   0
 .../executor/proxies/BatchActionProxyTest.scala    |   0
 .../executor/proxies/OnlineActionProxyTest.scala   |   0
 .../executor/statemachine/PredictorFSMTest.scala   |   0
 .../scala/org/marvin/fixtures/MetadataMock.scala   |   0
 .../test/scala/org/marvin/util/JsonUtilTest.scala  |   0
 .../scala/org/marvin/util/LocalCacheTest.scala     |   0
 .../scala/org/marvin/util/ProtocolUtilTest.scala   |   0
 python-toolbox/.dev                                |   0
 python-toolbox/setup.py                            |   3 +-
 90 files changed, 262 insertions(+), 3 deletions(-)