Skip to content

Commit

Permalink
Merge pull request #589 from openworm/development
Browse files Browse the repository at this point in the history
Release 0.3.9
  • Loading branch information
tarelli authored Feb 18, 2018
2 parents 063ff13 + e7e0204 commit a80cad0
Show file tree
Hide file tree
Showing 8 changed files with 707 additions and 118 deletions.
39 changes: 17 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
<p align="center">
<img src="https://github.com/tarelli/bucket/blob/master/geppetto%20logo.png?raw=true" alt="Geppetto logo"/>
<img src="https://raw.githubusercontent.com/tarelli/bucket/master/geppetto%20logo.png" alt="Geppetto logo"/>
</p>

# [Geppetto](http://www.geppetto.org/)

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/openworm/org.geppetto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Stories in Ready](https://badge.waffle.io/openworm/org.geppetto.png?label=ready&title=Ready)](https://waffle.io/openworm/org.geppetto)
[![StackShare](http://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](http://stackshare.io/tarelli/geppetto)

#### [Website](http://www.geppetto.org/) | [Documentation](http://docs.geppetto.org/) | [Releases](https://github.com/openworm/org.geppetto/releases/)
#### [Contribution guidelines](http://docs.geppetto.org/en/latest/contribute.html#how-to-contribute-code-to-geppetto) | [Development progress](https://waffle.io/openworm/org.geppetto)

**Geppetto is a web-based platform to visualise and simulate biological models.**
**Geppetto is an open-source platform to build web-based applications to visualize and simulate neuroscience data and models.**

Although Geppetto was designed with neuroscience and biology in mind, Geppetto can be used anywhere there is need to rely on a backend to perform any kind of simulation and allow the user to interact with it through a web application.
**If you just want to play with a demo Geppetto deployment you don't need to install anything, just visit <https://live.geppetto.org>.**

**If you just want to play with a sample Geppetto deployment you don't need to install anything, just visit <https://live.geppetto.org>.**
If you want to setup your own Geppetto deployment from sources use our [Setup Instructions](http://docs.geppetto.org/en/latest/osxlinuxsetup.html). If you need help building a neuroscience application using Geppetto or if you want to join the project as a contributor you can [send an email](mailto:matteo@geppetto.org) or just interact with us through GitHub!

If you want to setup your own Geppetto deployment from sources use our [Setup Instructions](http://docs.geppetto.org/en/latest/osxlinuxsetup.html). If you need help designing your own custom Geppetto deployment or want to join the project as a contributor you can [send an email](mailto:[email protected]) or just interact with us through GitHub!

This is the umbrella project that keeps together all the different modules currently available:
This is the umbrella project that keeps together all the different Geppetto modules currently available:

#### Java backend
The Java backend is used in client-server deployments of Geppetto. The Java backend is modular allowing each deployment to be customised only with the relevant bundles.
Expand All @@ -32,20 +29,15 @@ The Java backend is used in client-server deployments of Geppetto. The Java back
* [org.geppetto.persistence](https://github.com/openworm/org.geppetto.persistence) [![Build Status](https://travis-ci.org/openworm/org.geppetto.persistence.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.persistence)
* [org.geppetto.datasources](https://github.com/openworm/org.geppetto.datasources) [![Build Status](https://travis-ci.org/openworm/org.geppetto.datasources.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.datasources)
* Domain Specific
* Neuroscience
* [org.geppetto.model.neuroml](https://github.com/openworm/org.geppetto.model.neuroml) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.neuroml.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.neuroml)
* [org.geppetto.simulator.external](https://github.com/openworm/org.geppetto.simulator.external) [![Build Status](https://travis-ci.org/openworm/org.geppetto.simulator.external.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.simulator.external)
* [org.geppetto.model.swc](https://github.com/openworm/org.geppetto.model.swc) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.swc.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.swc)
* [org.geppetto.model.nwb](https://github.com/openworm/org.geppetto.model.nwb) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.nwb.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.nwb)
* Previous releases (not currently supported)
* Neuroscience
* [org.geppetto.simulator.jlems](https://github.com/openworm/org.geppetto.simulator.jlems) [![Build Status](https://travis-ci.org/openworm/org.geppetto.simulator.jlems.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.simulator.jlems)
* Fluid mechanics
* [org.geppetto.model.sph](https://github.com/openworm/org.geppetto.model.sph) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.sph.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.sph)
* [org.geppetto.solver.sph](https://github.com/openworm/org.geppetto.solver.sph) [![Build Status](https://travis-ci.org/openworm/org.geppetto.solver.sph.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.solver.sph)
* [org.geppetto.simulator.sph](https://github.com/openworm/org.geppetto.simulator.sph) [![Build Status](https://travis-ci.org/openworm/org.geppetto.simulator.sph.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.simulator.sph)

#### Python Backend (prototype)
* Neuroscience
* [org.geppetto.model.neuroml](https://github.com/openworm/org.geppetto.model.neuroml) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.neuroml.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.neuroml)
* [org.geppetto.simulator.external](https://github.com/openworm/org.geppetto.simulator.external) [![Build Status](https://travis-ci.org/openworm/org.geppetto.simulator.external.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.simulator.external)
* [org.geppetto.model.swc](https://github.com/openworm/org.geppetto.model.swc) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.swc.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.swc)
* [org.geppetto.model.nwb](https://github.com/openworm/org.geppetto.model.nwb) [![Build Status](https://travis-ci.org/openworm/org.geppetto.model.nwb.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.model.nwb)
* Fluid mechanics (Currently in development)
* [org.geppetto.sibernetic](https://github.com/openworm/org.geppetto.sibernetic) [![Build Status](https://travis-ci.org/openworm/org.geppetto.sibernetic.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.sibernetic)

#### Python Backend (prototype, in development)
The Python backend is based on a Geppetto Jupyter extension which allows the user to interact with the Geppetto frontend from Python. This deployment makes it ideal to use Geppetto as a visualization/computational local playground.
* [org.geppetto.frontend.jupyter](https://github.com/openworm/org.geppetto.frontend.jupyter) [![Build Status](https://travis-ci.org/openworm/org.geppetto.frontend.jupyter.png?branch=master)](https://travis-ci.org/openworm/org.geppetto.frontend.jupyter)
* [pyGeppetto](https://github.com/openworm/pygeppetto)
Expand All @@ -62,3 +54,6 @@ Geppetto is an open-source project with a growing community, if you want to cont

Geppetto is released under the [MIT](http://opensource.org/licenses/MIT) license.

<p align="center">
<img src="http://www.geppetto.org/images/geppetto.png" alt="Geppetto"/>
</p>
10 changes: 5 additions & 5 deletions geppetto.plan
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd">


<artifact type="bundle" name="org.geppetto.model" version="0.3.8"/>
<artifact type="bundle" name="org.geppetto.core" version="0.3.8"/>
<artifact type="bundle" name="org.geppetto.model.neuroml" version="0.3.8"/>
<artifact type="bundle" name="org.geppetto.simulation" version="0.3.8"/>
<artifact type="bundle" name="org.geppetto.frontend" version="0.3.8"/>
<artifact type="bundle" name="org.geppetto.model" version="0.3.9"/>
<artifact type="bundle" name="org.geppetto.core" version="0.3.9"/>
<artifact type="bundle" name="org.geppetto.model.neuroml" version="0.3.9"/>
<artifact type="bundle" name="org.geppetto.simulation" version="0.3.9"/>
<artifact type="bundle" name="org.geppetto.frontend" version="0.3.9"/>


</plan>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.geppetto</groupId>
<artifactId>org.geppetto</artifactId>
<name>Geppetto</name>
<version>0.3.8</version>
<version>0.3.9</version>
<packaging>pom</packaging>
<modules>
<module>../org.geppetto.model</module>
Expand Down
21 changes: 14 additions & 7 deletions utilities/docker/geppetto-persistence/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ ARG aKey
ENV aKey=${aKey}
ARG sKey
ENV sKey=${sKey}
ARG persistenceBranch=development
ENV persistenceBranch=${persistenceBranch}
ARG frontendBranch=development
ENV frontendBranch=${frontendBranch}
RUN echo "$frontendBranch";
RUN echo "$persistenceBranch";
ARG persistenceBranch
ENV persistenceBranch=${persistenceBranch:-development}
ARG frontendBranch
ENV frontendBranch=${frontendBranch:-development}

RUN echo $frontendBranch;
RUN echo $persistenceBranch;

RUN apt-get update && apt-get install -qq -y sudo

Expand Down Expand Up @@ -43,10 +44,14 @@ ENV MAVEN_HOME /opt/maven

#VIRGO INSTALL
USER root
RUN apt-get update && apt-get install -y -qq curl bsdtar
RUN apt-get update && apt-get install -qq -y curl bsdtar locate
USER developer
RUN mkdir -p /home/developer/virgo
RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf -
ADD dmk.sh /home/developer/virgo/bin/
USER root
RUN chown developer /home/developer/virgo/bin/dmk.sh
USER developer
RUN chmod u+x /home/developer/virgo/bin/*.sh
ENV SERVER_HOME /home/developer/virgo
#VOLUME /home/developer/virgo
Expand All @@ -61,6 +66,8 @@ RUN chmod -R 777 workspace
USER developer

COPY config.json workspace/org.geppetto/utilities/source_setup/
RUN sudo mv /home/developer/workspace/org.geppetto/utilities/docker/geppetto-persistence/geppetto.plan /home/developer

COPY geppetto.plan workspace/org.geppetto/

RUN sudo chmod -R 777 workspace;
Expand Down
Loading

0 comments on commit a80cad0

Please sign in to comment.