Merge branch 'master' into andover

sharppy · Mar 9, 2020 · 1b50cdb · 1b50cdb
2 parents 0403185 + 616d3b8
commit 1b50cdb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,13 @@
+FROM python:2.7
+
+RUN apt-get -y update \
+    && apt-get install -y libqt4-dev cmake xvfb
+
+RUN pip install numpy==1.13 pyside==1.2.4
+
+COPY . /sharppy
+WORKDIR /sharppy
+RUN python setup.py install
+
+WORKDIR /sharppy/runsharp
+CMD python full_gui.py