diff --git a/.gitignore b/.gitignore index db537a9..f1fddd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -*.swp -input/ -output/ +*.swp \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 906a229..2926970 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,8 @@ RUN apt-get -y update && \ python-wxgtk3.0 \ python-zmq WORKDIR /usr/local/src -RUN git clone https://github.com/CellProfiler/CellProfiler.git +ARG VERSION=stable +RUN git clone -b $VERSION https://github.com/CellProfiler/CellProfiler.git WORKDIR /usr/local/src/CellProfiler # Install CellProfiler at a specific version RUN git checkout tags/2.2.0 diff --git a/Makefile b/Makefile index ae65347..0062213 100644 --- a/Makefile +++ b/Makefile @@ -55,4 +55,4 @@ test: input output output/gold data input/filelist.txt AS_09125_050116030001_D03 diff -b output/AS_09125_050116030001_D03f00d0_Outline.png output/gold/AS_09125_050116030001_D03f00d0_Outline.png diff -b output/Nuclei.csv output/gold/Nuclei.csv diff -b output/Cells.csv output/gold/Cells.csv - diff -b output/Cytoplasm.csv output/gold/Cytoplasm.csv + diff -b output/Cytoplasm.csv output/gold/Cytoplasm.csv \ No newline at end of file diff --git a/README.md b/README.md index c814b1b..9679237 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -[![Build -Status](https://travis-ci.com/recursionpharma/cellprofiler-docker.svg?token=GrWRwBK4pgTygz4Nzroz&branch=master)](https://travis-ci.com/recursionpharma/cellprofiler-docker) +[![Build Status](https://travis-ci.org/CellProfiler/docker.svg?branch=master)](https://travis-ci.org/CellProfiler/docker) Testing docker locally: @@ -10,4 +9,4 @@ On a Linux host machine, running CellProfiler's GUI from the container: # Note, the following line is insecure. xhost +local:root - docker run -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro cellprofiler:latest "" + docker run -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro cellprofiler:latest "" \ No newline at end of file