Skip to content

Commit 9f81006

Browse files
author
Ezequiel Torres
committed
Changes in Dockerfile deploy files
1 parent 28696c2 commit 9f81006

File tree

7 files changed

+77
-75
lines changed

7 files changed

+77
-75
lines changed

‎tools/installer/Dockerfiles/centos7.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ RUN yum update -y
2525
# Install packages
2626
RUN yum install libxkbcommon tk-devel lapack-devel cmake tcl tcl-devel expect tkinter openssh-server gcc gcc-c++ wget xz make vim openssl-devel openssh-clients rpm-build ruby-devel libpng libpng-devel sqlite-devel freeglut-devel libxcb libxcb-devel xcb-util xcb-util-devel git -y
2727

28-
# Download python 2.7.11
28+
# Download python 3.6.2
2929
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
30-
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
31-
tar xJvf Python-2.7.11.tar.xz && \
32-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
33-
rm -rf /tmp/Python-2.7.11*
30+
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
31+
tar xJvf Python-3.6.2.tar.xz && \
32+
cd Python-3.6.2 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
33+
rm -rf /tmp/Python-3.6.2*
3434

3535
# Install Qt5.7
3636
RUN git clone git://code.qt.io/qt/qtbase.git && \
@@ -82,7 +82,7 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
8282
rm -rf /tmp/qtstyleplugins
8383

8484
# Add Python scripts
85-
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
85+
ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
8686

8787
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
8888

‎tools/installer/Dockerfiles/debian8.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ RUN apt-get install cmake \
5050
pkg-config \
5151
-y
5252

53-
# Download python 2.7.11
53+
# Download python 3.6.2
5454
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
55-
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
56-
tar xJvf Python-2.7.11.tar.xz && \
57-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
58-
rm -rf /tmp/Python-2.7.11*
55+
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
56+
tar xJvf Python-3.6.2.tar.xz && \
57+
cd Python-3.6.2 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
58+
rm -rf /tmp/Python-3.6.2*
5959

6060
# Install Qt5.7
6161
RUN git clone git://code.qt.io/qt/qtbase.git && \
@@ -108,7 +108,7 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
108108
rm -rf /tmp/qtstyleplugins
109109

110110
# Add Python scripts
111-
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
111+
ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
112112

113113
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
114114

‎tools/installer/Dockerfiles/fedora20.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ RUN yum install tk-devel lapack-devel cmake tcl tcl-devel expect tkinter openssh
3232
# tar xzvf openssl-1.1.0c.tar.gz && \
3333
# cd openssl-1.1.0c && ./config && make && make install
3434

35-
# Download python 2.7.11
35+
# Download python 3.6.2
3636
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
37-
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
38-
tar xJvf Python-2.7.11.tar.xz && \
39-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
40-
rm -rf /tmp/Python-2.7.11*
37+
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
38+
tar xJvf Python-3.6.2.tar.xz && \
39+
cd Python-3.6.2 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
40+
rm -rf /tmp/Python-3.6.2*
4141

4242
# Install Qt5.7
4343
RUN git clone git://code.qt.io/qt/qtbase.git && \
@@ -89,7 +89,7 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
8989
rm -rf /tmp/qtstyleplugins
9090

9191
# Add Python scripts
92-
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
92+
ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
9393

9494
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
9595

‎tools/installer/Dockerfiles/generate_containers.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22
RELEASE=0.0.5
3+
PYTHON_VERSION=3.6.2
34

45
function check_run_as_root() {
56
case `id` in
@@ -17,27 +18,28 @@ function main() {
1718
check_run_as_root
1819
dockerfile_array=("ubuntu1404"
1920
"ubuntu1604"
20-
# "ubuntu1610"
21+
"ubuntu1610"
2122
"debian8"
22-
# "fedora20"
23+
"fedora20"
2324
"centos7")
2425

2526
containers_array=("mlc_ubuntu:14.04"
2627
"mlc_ubuntu:16.04"
27-
# "mlc_ubuntu:16.10"
28+
"mlc_ubuntu:16.04-improved"
29+
"mlc_ubuntu:16.10"
2830
"mlc_debian:8"
29-
# "mlc_fedora:20"
31+
"mlc_fedora:20"
3032
"mlc_centos:7")
3133

3234
# (Loop until we find an empty string.)
3335
#
3436
count=0
3537
while [ "x${dockerfile_array[count]}" != "x" ]
3638
do
37-
docker build -f "${dockerfile_array[count]}.dockerfile" -t ${containers_array[count]} --build-arg RELEASE=$RELEASE .
38-
# docker run --rm -v $(pwd)/release:/tmp/release -it ${containers_array[count]} bash
39+
docker build -f "${dockerfile_array[count]}.dockerfile" -t ${containers_array[count]} --build-arg RELEASE=$RELEASE --build-arg PYTHON_VERSION=$PYTHON_VERSION .
40+
docker run --rm -v $(pwd)/release:/tmp/release -it ${containers_array[count]} bash
3941
count=$(( $count + 1 ))
4042
done
4143
}
4244

43-
main $*
45+
main $*

‎tools/installer/Dockerfiles/ubuntu1404.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ RUN apt-get install cmake \
5151
pkg-config \
5252
-y
5353

54-
# Download python 2.7.11
54+
# Download python 3.6.2
5555
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
56-
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
57-
tar xJvf Python-2.7.11.tar.xz && \
58-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
59-
rm -rf /tmp/Python-2.7.11*
56+
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
57+
tar xJvf Python-3.6.2.tar.xz && \
58+
cd Python-3.6.2 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
59+
rm -rf /tmp/Python-3.6.2*
6060

6161
# Install Qt5.7
6262
RUN git clone git://code.qt.io/qt/qtbase.git && \
@@ -109,7 +109,7 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
109109
rm -rf /tmp/qtstyleplugins
110110

111111
# Add Python scripts
112-
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
112+
ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
113113

114114
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
115115

‎tools/installer/Dockerfiles/ubuntu1604.dockerfile‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN apt-get install cmake \
5151
pkg-config \
5252
-y
5353

54-
# Download python 2.7.11
54+
# Download python 3.6.2
5555
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
5656
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
5757
tar xJvf Python-3.6.2.tar.xz && \
@@ -61,51 +61,51 @@ RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
6161
# Install Qt5.7
6262
RUN git clone git://code.qt.io/qt/qtbase.git && \
6363
cd qtbase && \
64-
git checkout 5.7 && \
65-
./configure --prefix=/opt/mlc-python-3.6.2/Qt-5.7.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && \
64+
git checkout v5.9.1 && \
65+
./configure --prefix=/opt/mlc-python-3.6.2/Qt-5.9.1 -xkb-config-root /usr/share/X11/xkb -no-gtk -nomake tests -nomake examples -qt-xcb --opensource --confirm-license && \
6666
make -j4 && make install && \
6767
rm -rf /tmp/qtbase
6868

6969
RUN git clone git://code.qt.io/qt/qttools.git && \
7070
cd qttools && \
71-
git checkout 5.7 && \
72-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
71+
git checkout v5.9.1 && \
72+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake CONFIG+=release && make -j4 && make install && \
7373
rm -rf /tmp/qttools
7474

7575
RUN git clone git://code.qt.io/qt/qtcharts.git && \
7676
cd qtcharts && \
77-
git checkout 5.7 && \
78-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
77+
git checkout v5.9.1 && \
78+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake CONFIG+=release && make -j4 && make install && \
7979
rm -rf /tmp/qtcharts
8080

8181
RUN git clone git://code.qt.io/qt/qtdatavis3d.git && \
8282
cd qtdatavis3d && \
83-
git checkout 5.7 && \
84-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
83+
git checkout v5.9.1 && \
84+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake CONFIG+=release && make -j4 && make install && \
8585
rm -rf /tmp/qtdatavis3d
8686

8787
RUN git clone git://code.qt.io/qt/qtdeclarative.git && \
8888
cd qtdeclarative && \
89-
git checkout 5.7 && \
90-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
89+
git checkout v5.9.1 && \
90+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake CONFIG+=release && make -j4 && make install && \
9191
rm -rf /tmp/qtdeclarative
9292

9393
RUN git clone git://code.qt.io/qt/qtx11extras.git && \
9494
cd qtx11extras && \
95-
git checkout 5.7 && \
96-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake CONFIG+=release && make -j4 && make install && \
95+
git checkout v5.9.1 && \
96+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake CONFIG+=release && make -j4 && make install && \
9797
rm -rf /tmp/qtx11extras
9898

9999
RUN git clone https://github.com/Ezetowers/qt5ct.git && \
100100
cd qt5ct && \
101-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake PREFIX=/opt/mlc-python-3.6.2/qt5ct && make -j4 && make install && \
101+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake PREFIX=/opt/mlc-python-3.6.2/qt5ct && make -j4 && make install && \
102102
rm -rf /tmp/qt5ct
103103

104104
RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
105105
cd qtstyleplugins && \
106-
/opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake && make && \
107-
mkdir -p /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
108-
cp -r ./plugins/styles/* /opt/mlc-python-3.6.2/Qt-5.7.1/plugins/styles && \
106+
/opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake && make && \
107+
mkdir -p /opt/mlc-python-3.6.2/Qt-5.9.1/plugins/styles && \
108+
cp -r ./plugins/styles/* /opt/mlc-python-3.6.2/Qt-5.9.1/plugins/styles && \
109109
rm -rf /tmp/qtstyleplugins
110110

111111
# Add Python scripts
@@ -114,34 +114,34 @@ ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
114114
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
115115

116116
# # Add PyQt5 Support
117-
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz && \
118-
tar xzvf sip-4.19.tar.gz && \
119-
cd sip-4.19 && \
117+
RUN wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.3/sip-4.19.3.tar.gz && \
118+
tar xzvf sip-4.19.3.tar.gz && \
119+
cd sip-4.19.3 && \
120120
/opt/mlc-python-3.6.2/bin/mlc_python configure.py && \
121121
make -j4 && make install && \
122-
rm -rf /tmp/sip-4.19*
122+
rm -rf /tmp/sip-4.19.3*
123123

124-
RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz && \
125-
tar xzvf PyQt5_gpl-5.7.1.tar.gz && \
126-
cd PyQt5_gpl-5.7.1 && \
127-
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --confirm-license --sip /opt/mlc-python-3.6.2/bin/sip && \
124+
RUN wget https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.tar.gz && \
125+
tar xzvf PyQt5_gpl-5.9.tar.gz && \
126+
cd PyQt5_gpl-5.9 && \
127+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake --confirm-license --sip /opt/mlc-python-3.6.2/bin/sip && \
128128
make -j4 && make install && \
129-
rm -rf /tmp/PyQt5_gpl-5.7.1*
129+
rm -rf /tmp/PyQt5_gpl-5.9*
130130

131131
# Add PyQt5 Charts
132-
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.7.1/PyQtChart_gpl-5.7.1.tar.gz && \
133-
tar xzvf PyQtChart_gpl-5.7.1.tar.gz && \
134-
cd PyQtChart_gpl-5.7.1 && \
135-
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
132+
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtChart/PyQtChart-5.9/PyQtChart_gpl-5.9.tar.gz && \
133+
tar xzvf PyQtChart_gpl-5.9.tar.gz && \
134+
cd PyQtChart_gpl-5.9 && \
135+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
136136
make -j4 && make install && \
137-
rm -rf /tmp/PyQtChart_gpl-5.7.1*
137+
rm -rf /tmp/PyQtChart_gpl-5.9*
138138

139-
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtDataVisualization-5.7.1/PyQtDataVisualization_gpl-5.7.1.tar.gz/download -O PyQtDataVisualization_gpl-5.7.1.tar.gz && \
140-
tar xzvf PyQtDataVisualization_gpl-5.7.1.tar.gz && \
141-
cd PyQtDataVisualization_gpl-5.7.1 && \
142-
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.7.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
139+
RUN wget https://sourceforge.net/projects/pyqt/files/PyQtDataVisualization/PyQtDataVisualization-5.9/PyQtDataVisualization_gpl-5.9.tar.gz/download -O PyQtDataVisualization_gpl-5.9.tar.gz && \
140+
tar xzvf PyQtDataVisualization_gpl-5.9.tar.gz && \
141+
cd PyQtDataVisualization_gpl-5.9 && \
142+
/opt/mlc-python-3.6.2/bin/mlc_python configure.py --qmake /opt/mlc-python-3.6.2/Qt-5.9.1/bin/qmake --sip /opt/mlc-python-3.6.2/bin/sip && \
143143
make -j4 && make install && \
144-
rm -rf /tmp/PyQtDataVisualization_gpl-5.7.1*
144+
rm -rf /tmp/PyQtDataVisualization_gpl-5.9*
145145

146146
RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz && \
147147
tar xzvf graphviz-2.40.1.tar.gz && \
@@ -153,10 +153,10 @@ RUN wget http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar
153153
# Create .sh who will load the desired enviroment to run nosetests within it
154154
RUN export CFLAGS="-I/tmp/graphviz-2.40.1/include" \
155155
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/custom_libs:$LD_LIBRARY_PATH && \
156-
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/lib:$LD_LIBRARY_PATH && \
156+
export LD_LIBRARY_PATH=/opt/mlc-python-3.6.2/Qt-5.9.1/lib:$LD_LIBRARY_PATH && \
157157
export LD_LIBRARY_PATH=/tmp/graphviz-2.40.1/lib:$LD_LIBRARY_PATH && \
158158
export PKG_CONFIG_PATH=/tmp/graphviz-2.40.1/lib/pkgconfig:$PKG_CONFIG_PATH && \
159-
export PATH=/opt/mlc-python-3.6.2/Qt-5.7.1/bin:$PATH && \
159+
export PATH=/opt/mlc-python-3.6.2/Qt-5.9.1/bin:$PATH && \
160160
export PATH=/opt/mlc-python-3.6.2/custom_bins:$PATH && \
161161
export PATH=/tmp/graphviz-2.40.1/bin:$PATH && \
162162
/opt/mlc-python-3.6.2/bin/mlc_pip install networkx pydotplus pygraphviz 'ipython<6.0.0' numpy flask requests pyserial nose pyyaml coverage matplotlib scipy pyusb

‎tools/installer/Dockerfiles/ubuntu1610.dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ RUN apt-get install cmake \
5151
pkg-config \
5252
-y
5353

54-
# Download python 2.7.11
54+
# Download python 3.6.2
5555
# For more information about the compilation of the Python: http://www.mathworks.com/help/matlab/matlab_external/system-requirements-for-matlab-engine-for-python.html?requestedDomain=www.mathworks.com
56-
RUN wget -q https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz && \
57-
tar xJvf Python-2.7.11.tar.xz && \
58-
cd Python-2.7.11 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
59-
rm -rf /tmp/Python-2.7.11*
56+
RUN wget -q https://www.python.org/ftp/python/3.6.2/Python-3.6.2.tar.xz && \
57+
tar xJvf Python-3.6.2.tar.xz && \
58+
cd Python-3.6.2 && ./configure --enable-shared --enable-unicode=ucs4 --prefix=/opt/mlc-python-3.6.2 && make && make install && \
59+
rm -rf /tmp/Python-3.6.2*
6060

6161
# Install Qt5.7
6262
RUN git clone git://code.qt.io/qt/qtbase.git && \
@@ -109,7 +109,7 @@ RUN git clone git://code.qt.io/qt/qtstyleplugins.git && \
109109
rm -rf /tmp/qtstyleplugins
110110

111111
# Add Python scripts
112-
ADD mlc_python_scripts/* /opt/mlc-python-3.6.2/bin/
112+
ADD mlc_python_scripts/python3/* /opt/mlc-python-3.6.2/bin/
113113

114114
RUN /opt/mlc-python-3.6.2/bin/mlc_pip install --upgrade pip
115115

0 commit comments

Comments
 (0)