Additions to dockerfiles and package creation script

Author: Ezequiel Torres

tools/installer/Dockerfiles/centos7.dockerfile

@@ -127,10 +127,12 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
     rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
 
 # Install mlc dependencies
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install pyserial numpy nose matplotlib scipy pyyaml flask requests
+RUN /opt/mlc-python-2.7.11/bin/mlc_pip install ipython pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
+RUN gem install fpm
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}
-ENV OS_VERSION ubuntu-16.04
+ENV OS_VERSION centos-7
+ENV PACKAGE_TYPE rpm
 ADD deploy_scripts/* /tmp/deploy_scripts/
 ENTRYPOINT ["/tmp/deploy_scripts/create_MLC_folder.sh"]

tools/installer/Dockerfiles/deploy_scripts/create_MLC_folder.sh

@@ -10,7 +10,7 @@ tar xzvf v$RELEASE.tar.gz -C $MLC_PATH
 rm -rf /tmp/v$RELEASE.tar.gz
 
 # Add the mlc_python
-mv /opt/mlc-python-2.7.11 $MLC_PATH/mlc_python
+cp -r /opt/mlc-python-2.7.11 $MLC_PATH/mlc_python
 
 # Add project scripts
 cp -r /tmp/deploy_scripts/mlc.sh.in $MLC_PATH/mlc.sh
@@ -21,5 +21,18 @@ cp -r /tmp/deploy_scripts/install_matlab_engine.sh $MLC_PATH/tools
 cd $MLC_PATH
 ln -s mlc_python/bin/mlc_python mlc_python.sh
 ln -s mlc_python/bin/mlc_ipython mlc_ipython.sh
+ln -s mlc_python/bin/mlc_pip mlc_pip.sh
+
+# Clean unnecesary files in the MLC package
+find $MLC_PATH/mlc_python -name "*.pyc" | xargs rm -rf
+find $MLC_PATH/mlc_python -name "*.pyo" | xargs rm -rf
+find $MLC_PATH/mlc_python -name "*.pyd" | xargs rm -rf
+find $MLC_PATH/mlc_python -name "test" | xargs rm -rf
+rm -rf $MLC_PATH/Qt-5.7.1/docs
+rm -rf $MLC_PATH/Qt-5.7.1/include
+rm -rf $MLC_PATH/Qt-5.7.1/mkspecs
+
+# Create the MLC Package
 tar cJvpf /tmp/MLC-$RELEASE-$OS_VERSION.tar.xz -C /tmp MLC-$RELEASE
+fpm -s dir -t $PACKAGE_TYPE -v $RELEASE -n mlc-python-$OS_VERSION /opt/mlc-python-2.7.11
 bash

tools/installer/Dockerfiles/fedora20.dockerfile

@@ -134,10 +134,12 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
     rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
 
 # Install mlc dependencies
-RUN /opt/mlc-python-2.7.11/bin/mlc_pip install ipython pyserial numpy nose matplotlib scipy pyyaml flask requests
+RUN /opt/mlc-python-2.7.11/bin/mlc_pip install ipython pyserial numpy nose matplotlib scipy pyyaml flask requests pyusb
+RUN gem install fpm
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}
-ENV OS_VERSION ubuntu-16.04
+ENV OS_VERSION fedora-20
+ENV PACKAGE_TYPE rpm
 ADD deploy_scripts/* /tmp/deploy_scripts/
 ENTRYPOINT ["/tmp/deploy_scripts/create_MLC_folder.sh"]

tools/installer/Dockerfiles/ubuntu1404.dockerfile

@@ -155,10 +155,13 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
 # Create .sh who will load the desired enviroment to run nosetests within it
 RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
     export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
-    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy
+    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
+
+RUN gem install fpm
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}
-ENV OS_VERSION ubuntu-16.04
+ENV OS_VERSION ubuntu-14.04
+ENV PACKAGE_TYPE deb
 ADD deploy_scripts/* /tmp/deploy_scripts/
 ENTRYPOINT ["/tmp/deploy_scripts/create_MLC_folder.sh"]

tools/installer/Dockerfiles/ubuntu1604.dockerfile

@@ -155,10 +155,13 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
 # Create .sh who will load the desired enviroment to run nosetests within it
 RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
     export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
-    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy
+    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
+
+RUN gem install fpm
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}
 ENV OS_VERSION ubuntu-16.04
+ENV PACKAGE_TYPE deb
 ADD deploy_scripts/* /tmp/deploy_scripts/
 ENTRYPOINT ["/tmp/deploy_scripts/create_MLC_folder.sh"]

tools/installer/Dockerfiles/ubuntu1610.dockerfile

@@ -155,10 +155,13 @@ RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtD
 # Create .sh who will load the desired enviroment to run nosetests within it
 RUN export LD_LIBRARY_PATH=/usr/local/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
     export PATH=/usr/local/Qt-5.7.1/bin:$PATH && \
-    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy
+    /opt/mlc-python-2.7.11/bin/mlc_pip install ipython numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb
+
+RUN gem install fpm
 
 ARG RELEASE
 ENV RELEASE ${RELEASE}
-ENV OS_VERSION ubuntu-16.04
+ENV OS_VERSION ubuntu-16.10
+ENV PACKAGE_TYPE deb
 ADD deploy_scripts/* /tmp/deploy_scripts/
 ENTRYPOINT ["/tmp/deploy_scripts/create_MLC_folder.sh"]