Docker build fixes (#247)

Fixes errors arising in PyDesigner installation due to CMake

Author: TheJaeger

docker/Dockerfile_develop

@@ -61,6 +61,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 # Clone PyDesigner
 RUN mkdir -p /tmp/PyDesigner
+RUN pip3 install cmake
 RUN git clone -b develop --single-branch https://github.com/m-ama/PyDesigner.git /tmp/PyDesigner
 RUN pip3 install /tmp/PyDesigner
 RUN echo "alias python=python3" >> ~/.bashrc && source ~/.bashrc

docker/Dockerfile_latest

@@ -42,8 +42,7 @@ RUN apt-get update && \
       nano \
       software-properties-common \
       python2.7 python-pip \
-      python3-pip \
-      jq
+      python3-pip
 
 # Install MRTRIX3 dependencies
 RUN apt-get install -y --no-install-recommends \
@@ -62,7 +61,9 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 # Clone PyDesigner
 ADD install_pydesigner_release /tmp/install_pydesigner_release
+RUN sed -i 's/\r//g' /tmp/install_pydesigner_release
 RUN chmod +x /tmp/install_pydesigner_release && bash /tmp/install_pydesigner_release
+RUN pip3 install cmake
 RUN cd /tmp/PyDesigner && pip3 install .
 RUN echo "alias python=python3" >> ~/.bashrc && source ~/.bashrc
 RUN echo "alias pip=pip3" >> ~/.bashrc && source ~/.bashrc

docker/Dockerfile_release

@@ -1,5 +1,5 @@
 #!/bin/bash
 # Downloads and extractslatest release PyDesigner into /tmp/PyDesigner
 mkdir -p /tmp/PyDesigner
-export URL=$(curl -s https://api.github.com/repos/m-ama/PyDesigner/releases | jq -r '.[0] | .tarball_url')
+export URL=$(curl -s https://api.github.com/repos/m-ama/PyDesigner/releases/latest | grep "tarball" | cut -d '"' -f 4)
 wget -q -O - $URL | tar -xzvf - -C /tmp/PyDesigner --strip 1