[13/13] marmotta git commit: merged MARMOTTA-588 branch

[wikier]

merged MARMOTTA-588 branch


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/501ab257
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/501ab257
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/501ab257

Branch: refs/heads/develop
Commit: 501ab257fb75366804740059ce9275a281d0b984
Parents: adefed4 59a2b9e
Author: Sergio Fernández <wik...@apache.org>
Authored: Thu Nov 12 18:27:45 2015 +0100
Committer: Sergio Fernández <wik...@apache.org>
Committed: Thu Nov 12 18:27:45 2015 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/Dockerfile            | 72 ++++++++++++++++++++
 launchers/marmotta-webapp/README.md             | 49 +++++++++++++
 .../marmotta-webapp/src/deb/control/control     |  2 +-
 .../marmotta-webapp/src/docker/entrypoint.sh    | 23 +++++++
 4 files changed, 145 insertions(+), 1 deletion(-)
----------------------------------------------------------------------