fix imagemagick lib for DICOM conversion

ims/Dockerfile

@@ -18,35 +18,42 @@ FROM cytomine/tomcat7:v1.1
 
 MAINTAINER Cytomine Team "support@cytomine.be"
 
-RUN apt-get -y update && apt-get install -y software-properties-common && \
-    add-apt-repository -y ppa:semiosis/ppa && apt-get -y update && apt-get install -y \
-      ant \
+RUN apt-get -y update && apt-get install -y ant \
+      automake \
       dnsutils \
       git \
       gobject-introspection \
       gtk-doc-tools \
-      imagemagick \
-      libglib2.0-dev \
-      libgsf-1-dev \
+      libfftw3-dev \
+	  libgsf-1-dev \
+	  libglib2.0-dev \
       libjpeg8-dev \
-      libmemcached-dev \
+      libopenexr-dev \
       libopenjpeg-dev \
+      liborc-0.4-0 \
+      liborc-0.4-dev \
       libtiff5-dev \
       libtiff-tools \
+      libtool \
       libxml2-dev \
+      software-properties-common \
       swig && \
-    apt-get -y build-dep openslide iipimage-server libvips-dev
+    apt-get -y build-dep openslide libvips-dev
 
 #openslide
 RUN cd /tmp && git clone https://github.com/openslide/openslide && cd /tmp/openslide && git checkout 4cd4b83c3ffff0382126d0618c85407f2c469b28 && autoreconf -i && ./configure && make && make install
 
 # use previous lib of lipopenjpeg-dev due to the bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734238
-RUN cd /tmp && wget http://launchpadlibrarian.net/147357170/libopenjpeg2_1.3%2Bdfsg-4.6ubuntu2_amd64.deb && dpkg -i libopenjpeg2_1.3+dfsg-4.6ubuntu2_amd64.deb
-RUN cd /tmp && wget http://launchpadlibrarian.net/147357169/libopenjpeg-dev_1.3%2Bdfsg-4.6ubuntu2_amd64.deb && dpkg -i libopenjpeg-dev_1.3+dfsg-4.6ubuntu2_amd64.deb
+#RUN cd /tmp && wget http://launchpadlibrarian.net/147357170/libopenjpeg2_1.3%2Bdfsg-4.6ubuntu2_amd64.deb && dpkg -i libopenjpeg2_1.3+dfsg-4.6ubuntu2_amd64.deb
+#RUN cd /tmp && wget http://launchpadlibrarian.net/147357169/libopenjpeg-dev_1.3%2Bdfsg-4.6ubuntu2_amd64.deb && dpkg -i libopenjpeg-dev_1.3+dfsg-4.6ubuntu2_amd64.deb
+
+# imagemagick 6.8.9-10 (fix problem with DICOM conversion by vips on Ubuntu 14.04)
+RUN cd /tmp && wget https://www.imagemagick.org/download/releases/ImageMagick-6.8.9-10.tar.xz && tar xf ImageMagick-6.8.9-10.tar.xz && cd ImageMagick-6.8.9-10 && ./configure && make && make install && ldconfig /usr/local/lib
 
 # vips
 RUN cd /tmp && wget https://github.com/jcupitt/libvips/releases/download/v8.5.1/vips-8.5.1.tar.gz && tar -zxvf ./vips-8.5.1.tar.gz && cd ./vips-8.5.1 && LDFLAGS="-L/usr/local/lib -lopenslide" CPPFLAGS="-I/usr/local/include/openslide"  ./configure && make && make install
 
+
 #openslide-java
 RUN update-java-alternatives -s java-8-oracle
 RUN export JAVA_HOME=/usr/lib/jvm/java-8-oracle && export CFLAGS="-I/usr/lib/jvm/java-8-oracle" && cd /tmp && git clone https://github.com/cytomine/openslide-java && cd /tmp/openslide-java && git checkout 93af97eeca8f0b63e9f71a6916af474ecc474dc8 && autoreconf -i && ./configure && make && make install

ims/deploy.sh

@@ -47,7 +47,7 @@ echo "cytomine.storageBufferPath=$IMS_BUFFER_PATH" >> imageserverconfig.properti
 echo "cytomine.imageServerPublicKey=$IMS_PUB_KEY" >> imageserverconfig.properties
 echo "cytomine.imageServerPrivateKey=$IMS_PRIV_KEY" >> imageserverconfig.properties
 echo "cytomine.vips=/usr/local/bin/vips" >> imageserverconfig.properties
-echo "cytomine.identify=identify" >> imageserverconfig.properties
+echo "cytomine.identify=/usr/local/bin/identify" >> imageserverconfig.properties
 echo "cytomine.tiffinfo=tiffinfo" >> imageserverconfig.properties
 echo "cytomine.vipsthumbnail=/usr/local/bin/vipsthumbnail" >> imageserverconfig.properties