From 1ab89abf3c6687231242004be4a4d18f28cd93f7 Mon Sep 17 00:00:00 2001
From: Herbert Steininger <herbert_steininger@psych.mpg.de>
Date: Fri, 14 Apr 2017 21:53:00 +0200
Subject: [PATCH] Cleanup

---
 Dockerfile | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c9b0ac2..166eef6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # hsteininger/DoMaLiMa
-# VERSION 1.0.0
+# VERSION 1.0.1
 
 #what image to use
 FROM debian
@@ -9,31 +9,23 @@ MAINTAINER Herbert Steininger <hsteininger@hsteininger.de>
 
 #set env variables
 ENV DEBIAN_FRONTEND noninteractive
+ENV PATH /usr/local/MatLab/2017a/etc:/usr/local/MatLab/2017a/bin:$PATH
 
 #set timezone
 RUN echo "TZ='Europe/Berlin'; export TZ" >> /root/.bashrc
 
 #run aptitude
-RUN apt-get update && apt-get install -y --fix-missing tar less vim wget lynx psmisc lsof strace
+RUN apt-get update && apt-get install -y --fix-missing lsb
 
-##MATLABstuff
-RUN apt-get install -y --fix-missing lsb
-
-#copy matlabstuff
+##MATLAB
+RUN adduser --disabled-password --gecos '' matlab
 ADD matlab_R2017a_glnxa64 /root/
+ADD start.sh /root/bin/
 COPY license.dat /root/license.dat
 COPY activate.ini /root/activate.ini
 COPY installer_input.txt /root/installer_input.txt
-
+RUN ln -s /tmp /usr/tmp
 RUN chmod -R 755 /root
 RUN /root/install -inputFile /root/installer_input.txt
 
-ADD ./start.sh /root/bin/
-RUN chmod -R 755 /root/bin/start.sh
-
-RUN ln -s /tmp /usr/tmp
-
-RUN adduser --disabled-password --gecos '' matlab
-
 ENTRYPOINT ["/root/bin/start.sh"]
-#CMD ["/bin/bash"]