This is an automated email from the ASF dual-hosted git repository.
fgreg pushed a change to branch SDAP-149
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git.
from f498e9c SDAP-149 Generate images directly from data
add 404ecbe Fixing merge conflicts with master (#53)
No new revisions were added by this update.
Summary of changes:
analysis/.gitignore | 3 +-
docker/nexus-webapp/Readme.md | 41 ++++++
.../nexus-webapp/install_conda.sh | 24 ++--
.../install_java.sh} | 24 +---
.../{install_nexus.sh => install_spark.sh} | 28 ++--
.../mesos/agent}/Dockerfile | 10 +-
.../mesos/agent}/docker-entrypoint.sh | 6 +-
docker/nexus-webapp/{ => mesos/base}/Dockerfile | 86 +++++++-----
.../mesos/base}/install_mesos.sh | 13 +-
.../mesos/master}/Dockerfile | 5 +-
.../mesos/webapp}/Dockerfile | 7 +-
.../{ => mesos/webapp}/docker-entrypoint.sh | 0
docker/nexus-webapp/{ => standalone}/Dockerfile | 42 +++---
.../standalone}/docker-entrypoint.sh | 3 +-
docker/spark-mesos-base/Dockerfile | 153 ---------------------
docs/quickstart.rst | 2 +-
16 files changed, 170 insertions(+), 277 deletions(-)
create mode 100644 docker/nexus-webapp/Readme.md
copy analysis/webservice/algorithms/imaging/ImageResult.py =>
docker/nexus-webapp/install_conda.sh (71%)
mode change 100644 => 100755
rename docker/{spark-mesos-base/install_nexusproto.sh =>
nexus-webapp/install_java.sh} (68%)
copy docker/nexus-webapp/{install_nexus.sh => install_spark.sh} (64%)
copy docker/{spark-mesos-agent => nexus-webapp/mesos/agent}/Dockerfile (64%)
copy docker/{spark-mesos-agent =>
nexus-webapp/mesos/agent}/docker-entrypoint.sh (83%)
copy docker/nexus-webapp/{ => mesos/base}/Dockerfile (51%)
rename docker/{spark-mesos-base => nexus-webapp/mesos/base}/install_mesos.sh
(92%)
mode change 100644 => 100755
rename docker/{spark-mesos-master => nexus-webapp/mesos/master}/Dockerfile
(69%)
rename docker/{spark-mesos-agent => nexus-webapp/mesos/webapp}/Dockerfile (88%)
rename docker/nexus-webapp/{ => mesos/webapp}/docker-entrypoint.sh (100%)
rename docker/nexus-webapp/{ => standalone}/Dockerfile (71%)
rename docker/{spark-mesos-agent =>
nexus-webapp/standalone}/docker-entrypoint.sh (87%)
delete mode 100644 docker/spark-mesos-base/Dockerfile
