Browse Source

resolves #73: it's now much easier to do functional testing via docker

zolfa-add_slices_loading
Jim Rybarski 9 years ago
parent
commit
ac94f3789f
2 changed files with 10 additions and 5 deletions
  1. +5
    -0
      Dockerfile
  2. +5
    -5
      Makefile

+ 5
- 0
Dockerfile View File

@ -16,12 +16,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-pip \
python3-pip \
libfreetype6-dev \
python-numpy \
python3-numpy \
python3-matplotlib \
libfreetype6-dev \
libpng-dev \
libjpeg-dev \
pkg-config \
python3-skimage \
tk \
tk-dev \
python3-tk \
&& pip3 install -U cython \
scikit-image \
&& rm -rf /var/lib/apt/lists/*


+ 5
- 5
Makefile View File

@ -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


Loading…
Cancel
Save