Merge branch 'master' of github.com:SemsProject/CombineArchiveWeb

Author: FreakyBytes

Dockerfile

@@ -0,0 +1,22 @@
+FROM tomcat:latest
+MAINTAINER martin scharm
+
+COPY src /srv/src
+COPY pom.xml /srv/pom.xml
+COPY src/main/docker/CombineArchiveWeb-DockerContext.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
+WORKDIR /srv/
+
+# install dependencies, compile the code, and get rid of dependencies...
+RUN deps="maven openjdk-${JAVA_VERSION%%[-~bu]*}-jdk=$JAVA_DEBIAN_VERSION" \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends $deps \
+	&& mvn package \
+	&& cp target/*war /usr/local/tomcat/webapps/ROOT.war \
+	&& mvn clean \
+	&& rm -rf /usr/local/tomcat/webapps/ROOT \
+	&& rm -rf /root/.m2 /usr/share/doc \
+	&& apt-get purge -y --auto-remove $deps \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
+
+

README.md

@@ -1,21 +1,67 @@
-# webCAT
-This webapplication is a part of the [CombineArchiveToolkit](https://sems.uni-rostock.de/projects/combinearchive/), a selection of tools to
-create, modify, and share CombineArchives.
-Find more information on how to build and deploy it on the [project page](https://sems.uni-rostock.de/trac/combinearchive-web).
+# WebCAT
+
+The [CombineArchive](http://co.mbine.org/standards/omex) is a zip like format to bundle latest research files and annotate them with meta data. The [CombineArchive WebInterface (WebCAT)](https://github.com/SemsProject/CombineArchiveWeb) is a web based user interface to create, modify, and share CombineArchives. No need for registration. No database. Just start using the web interface!
+
+## Build and Run
+
+You will find detailed information on how to build and deploy the web application on the [project page](https://sems.uni-rostock.de/trac/combinearchive-web).
+
+
+
+## Docker
+
+There is a Docker image available at [binfalse/webcat](https://hub.docker.com/r/binfalse/webcat/). It is configured to automatically build the latest version of the application based on the [Dockerfile](Dockerfile) included in this repository. In addition, we compile every version of the application in a tagged Docker image [through maven](https://binfalse.de/2016/05/31/mvn-automagically-create-a-docker-image/).
+
+Run a Docker container as:
+
+    docker run -it --rm -p 1234:8080 binfalse/webcat:latest
+
+This will start the Tomcat web server and bind the host's port `1234` to the containers port `8080`, which Tomcat listens at. It will permanently dump Tomcat's catalina output log.
+
+As soon as the container is up and running you should be able to access the CombineArchive web interface at http://localhost:1234
+
+### Save Workspaces and COMBINE archives
+The above command will destroy all archives and workspaces as soon as you stop/reboot the container.
+It's however also possible to mount persistent storage into the container. Let's say you want to save everything at the host's `/storage/for/webcat`, then you can just mount that into the container using:
+
+    docker run  --rm -it -p 1234:8080 -v /storage/for/webcat:/srv/CombineArchiveWeb binfalse/webcat:latest
+
+After creating a COMBINE archive in WebCAT you'll find it on the host machine in `/storage/for/webcat/WORKSPACE/ARCHIVE`.
+
+### Modify the Settings of WebCAT
+WebCAT's settings are configured using a tomcat-style `context.xml`. The [context that is deployed by default is available from the git repository,](https://github.com/binfalse/CombineArchiveWeb/blob/master/src/main/docker/CombineArchiveWeb-DockerContext.xml) you may use that as a template.
+
+To change that configuration you can either mount a directory containing a file called `ROOT.xml` with an alternative configuration to the container's `/usr/local/tomcat/conf/Catalina/localhost/` directory :
+
+    docker run  --rm -it -p 1234:8080 -v /storage/dir/with/other/context:/usr/local/tomcat/conf/Catalina/localhost/ binfalse/webcat:latest
+
+Or you create a new image based on this one, which overwrites the configuration with your `context.xml`.
+
+
+
 
 ## Demo
 A demo is currently hosted on our server. *No need for registration!*
 [Just start to explore](http://webcat.sems.uni-rostock.de)
 
+
+
 ## Development
 The development is currently coordinated at our [trac project management](https://sems.uni-rostock.de/trac/combinearchive-web).
 
+
+
 ## Additional Resources
 Some helpful resources can be found in the resources folder. It contains a default context configuration for tomcat, a default
 VHost configuration for the Apache WebServer and a folder called "nagios" containing a simple python3 script for nagios, to
 check if the webCAT instance is up and running. In case a stats secret is provided (and configured in the python script) it
 also checks for the maximum space quota.
 
+
+## Request for comments
+We are always keen on getting feedback from our users. If you have any comments, requests for features, or experience any problems [do not hesitate to leave a comment.](https://github.com/SemsProject/CombineArchiveWeb/issues/new)
+
+
 ## Licence
     CombineArchiveWeb - a WebInterface to read/create/write/manipulate/... COMBINE archives
     Copyright (C) 2014-2016:

pom.xml

@@ -179,7 +179,7 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-7</version>
+                <version>2.10</version>
             </extension>
         </extensions>
         <resources>
@@ -310,16 +310,6 @@
                                             <arg value="push" />
                                             <arg value="binfalse/webcat:${project.version}" />
                                         </exec>
-                                        <exec executable="docker">
-                                            <arg value="tag" />
-                                            <arg value="-f" />
-                                            <arg value="binfalse/webcat:${project.version}" />
-                                            <arg value="binfalse/webcat:latest" />
-                                        </exec>
-                                        <exec executable="docker">
-                                            <arg value="push" />
-                                            <arg value="binfalse/webcat:latest" />
-                                        </exec>
                                     </target>
                                 </configuration>
                                 <goals>