Merge branch 'develop' of cst.version.fz-juelich.de:jupedsim/jpseditor into develop

CHANGELOG.md

@@ -9,6 +9,11 @@ All notable changes to this project will be documented in this file.
 
 ### Bugs fixed
 
+### Bugs
+
+    Several heap errors, especially related to the undo/redo framework
+    Autosave not working properly
+    
 ## v0.8.0 [05.03.2016]
 
 ### Added

Dockerfile

+#-------------------------------------------------------------
+# - build:
+#   docker build -t jupedsim/jpseditor .
+# - run:
+#   1. socat TCP-LISTEN:6000,reuseaddr,fork UNIX-CLIENT:\"$DISPLAY\"                                                                  
+#   2. docker -it -e DISPLAY=<your ip address>  jupedsim/jpseditor
+#-------------------------------------------------------------
+
+FROM ubuntu:14.04
+ 
+MAINTAINER Erik Andresen <e.andresen@uni-wuppertal.de>
+
+# install required packages
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    g++ \
+    git \
+    lcov \
+    doxygen \
+    qt5-default qttools5-dev-tools \ 
+    # python \
+    # python-dev \
+    # python-pip \
+    && apt-get clean
+
+# set environment
+ENV HOME /home/jupedsim
+
+# add user
+RUN groupadd -r -g 1000 jupedsim && useradd -r -g jupedsim -u 1000 -m jupedsim
+USER jupedsim
+
+# install jpscore
+RUN mkdir -p /home/jupedsim/workspace
+RUN cd /home/jupedsim/workspace \
+    && git clone --depth=5 https://cst.version.fz-juelich.de/jupedsim/jpseditor.git \
+    && cd jpseditor \
+    && mkdir -p build \
+    && cd build \
+    && cmake -D DESIRED_QT_VERSION=5 ..\
+    && make
+
+
+# by default /bin/bash is executed
+CMD $HOME/workspace/jpseditor/bin/JPSeditor
\ No newline at end of file