Browse Source

made functional testing easier

zolfa-add_slices_loading
Jim Rybarski 9 years ago
parent
commit
fc91ae1633
2 changed files with 17 additions and 5 deletions
  1. +15
    -3
      Dockerfile
  2. +2
    -2
      Makefile

+ 15
- 3
Dockerfile View File

@ -1,10 +1,12 @@
FROM ubuntu:15.04
# This is just for functional testing. We install scikit-image just as a convenient way to view images. Many other
# packages could easily accomplish this.
FROM debian:latest
MAINTAINER Jim Rybarski <jim@rybarski.com> MAINTAINER Jim Rybarski <jim@rybarski.com>
RUN mkdir -p /var/nds2 RUN mkdir -p /var/nds2
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \ build-essential \
libatlas3-base \
liblapack-dev \ liblapack-dev \
libblas-dev \ libblas-dev \
python \ python \
@ -12,7 +14,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python-dev \ python-dev \
python3-dev \ python3-dev \
python-pip \ python-pip \
python3-pip
python3-pip \
libfreetype6-dev \
python3-matplotlib \
libfreetype6-dev \
libpng-dev \
libjpeg-dev \
pkg-config \
python3-skimage \
&& pip3 install -U cython \
scikit-image \
&& rm -rf /var/lib/apt/lists/*
COPY . /opt/nd2reader COPY . /opt/nd2reader
WORKDIR /opt/nd2reader WORKDIR /opt/nd2reader


+ 2
- 2
Makefile View File

@ -3,10 +3,10 @@
build: build:
docker build -t jimrybarski/nd2reader . docker build -t jimrybarski/nd2reader .
py2shell:
py2:
docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python2.7 docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python2.7
py3shell:
py3:
docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python3.4 docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python3.4
test: build test: build


Loading…
Cancel
Save