Skip to content
This repository has been archived by the owner on Jan 25, 2018. It is now read-only.

Commit

Permalink
Dockerfile for builing from source
Browse files Browse the repository at this point in the history
This allows Docker Hub to automatically build a new Docker image
for each new CellProfiler commit. The image will be based on
CentOS 6 and install CellProfiler's dependencies via RPM.
  • Loading branch information
ljosa committed Nov 25, 2014
1 parent ecb6b72 commit d1e7906
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
12 changes: 12 additions & 0 deletions cellprofiler-avoid-blank-libdir-for-libjvm.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--- cellprofiler/utilities/setup.py.orig 2013-10-16 19:26:11.279334211 -0400
+++ cellprofiler/utilities/setup.py 2013-10-16 19:26:38.739329959 -0400
@@ -106,7 +106,8 @@
stdout=subprocess.PIPE)
stdout, stderr = p.communicate()
jvm_dir = stdout.strip()
- library_dirs.append(jvm_dir)
+ if jvm_dir:
+ library_dirs.append(jvm_dir)
libraries = ["jvm"]
extensions += [Extension(name="javabridge",
sources=javabridge_sources,
11 changes: 11 additions & 0 deletions cellprofiler-frozen.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- CellProfiler.py.orig 2013-10-16 20:59:07.459360385 -0400
+++ CellProfiler.py 2013-10-16 20:16:34.079360393 -0400
@@ -20,6 +20,8 @@
import tempfile
from cStringIO import StringIO

+sys.frozen = True
+
if sys.platform.startswith('win'):
# This recipe is largely from zmq which seems to need this magic
# in order to import in frozen mode - a topic the developers never
11 changes: 11 additions & 0 deletions threshold.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- cellprofiler/cpmath/threshold.py 2014-07-23 13:39:57.000000000 -0400
+++ cellprofiler/cpmath/threshold.py 2014-10-27 16:21:40.719976873 -0400
@@ -417,7 +417,7 @@
# data
#
r = np.random.RandomState()
- r.seed(cropped_image[:100].tolist())
+ r.seed(np.frombuffer(cropped_image[:100].data, np.uint8).tolist())
for data in (
r.permutation(cropped_image)[0:(len(cropped_image) / 10)],
cropped_image):

0 comments on commit d1e7906

Please sign in to comment.