From d64c62b2b6c6ce9901f2c930fb25d6b3319017e2 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 4 Aug 2020 14:22:05 +1000
Subject: [PATCH] Update Dockerfile

---
 Dockerfile | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2dc6418..9c0b847 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,16 +5,6 @@ RUN apt update
 RUN apt install -y python3 gcc python3-pip
 RUN apt install -y openssh-client
 RUN pip3 install -r requirements.txt
-<<<<<<< HEAD
 RUN python3 ./setup.py install
-=======
-RUN mkdir -p /var/log/strudel2
-RUN pwd
-RUN ls
-RUN cd TES ; python3 ./setup.py install
-RUN pwd
-RUN ls
-RUN cd TWS ; python3 ./setup.py install
->>>>>>> Updated Scripts
 EXPOSE 8080 8090
 CMD ["./runscript"]
-- 
GitLab