diff --git a/Dockerfile b/Dockerfile index 7ee5208..7b389fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libjpeg-dev \ pkg-config \ python3-skimage \ + tk \ + tk-dev \ + python3-tk \ && pip3 install -U cython \ scikit-image \ && rm -rf /var/lib/apt/lists/* diff --git a/Makefile b/Makefile index c5d8cb6..7906c9d 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ info: @echo "Available Make Commands" @echo "" @echo "build: builds the image" - @echo "py2: mounts ~/Documents/nd2s to /var/nd2s and runs a Python 2.7 interpreter" - @echo "py3: mounts ~/Documents/nd2s to /var/nd2s and runs a Python 3.4 interpreter" + @echo "py2: maps ~/Documents/nd2s to /var/nd2s and runs a Python 2.7 interpreter" + @echo "py3: maps ~/Documents/nd2s to /var/nd2s and runs a Python 3.4 interpreter" @echo "test: runs all unit tests (in Python 3.4)" @echo "" @@ -14,13 +14,13 @@ build: docker build -t jimrybarski/nd2reader . shell: - docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader bash + xhost local:root; docker run --rm -v ~/Documents/nd2s:/var/nd2s -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$(DISPLAY) -it jimrybarski/nd2reader bash py2: - docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python2.7 + xhost local:root; docker run --rm -v ~/Documents/nd2s:/var/nd2s -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$(DISPLAY) -it jimrybarski/nd2reader python2.7 py3: - docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python3.4 + xhost local:root; docker run --rm -v ~/Documents/nd2s:/var/nd2s -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$(DISPLAY) -it jimrybarski/nd2reader python3.4 test: build docker run --rm -it jimrybarski/nd2reader python3.4 /opt/nd2reader/tests.py