retry to build all

qgis · Apr 6, 2018 · aa3c25b · aa3c25b
1 parent 00fbe18
commit aa3c25b
Showing 1 changed file with 18 additions and 23 deletions.
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -94,18 +94,12 @@ RUN  apt-get update \
     mock \
     future \
     termcolor \
-    virtualenv \
-  && apt-get autoremove -y python2.7 \
+  && apt-get autoremove -y python2.7 python3-sip sip-dev \
   && apt-get clean
 
   RUN bash -c "echo $(sip -V)"
   RUN bash -c "echo $(which sip)"
 
-WORKDIR /root
-RUN mkdir /root/virtualenvironment \
- && virtualenv /root/virtualenvironment/sip419
-WORKDIR /root/virtualenvironment/sip419/bin
-RUN bash -c "source activate"
 WORKDIR /root
 RUN curl -s -S -O https://www.riverbankcomputing.com/hg/sip/archive/tip.tar.gz \
  && tar xzf tip.tar.gz \
@@ -115,26 +109,27 @@ WORKDIR /root/sip419
 RUN python3 build.py prepare \
  && python3 configure.py \
  && make \
- && make install \
- && pip3 install PyQt5
+ && make install
 
  RUN bash -c "echo $(sip -V)"
  RUN bash -c "echo $(which sip)"
 
-# WORKDIR /root
-# RUN curl -s -S -O https://svwh.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz \
-#  && tar xzf PyQt5_gpl-5.9.2.tar.gz
-# WORKDIR /root/PyQt5_gpl-5.9.2
-# RUN apt-get install -y qt5-qmake \
-#  && python3 configure.py --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtSql --enable QtSvg && make && make install
-#
-# WORKDIR /root
-# RUN curl -s -S -O https://cfhcable.dl.sourceforge.net/project/pyqt/QScintilla2/QScintilla-2.10.3/QScintilla_gpl-2.10.3.tar.gz
-#  && tar xzf QScintilla_gpl-2.10.3.tar.gz
-# WORKDIR /root/QScintilla_gpl-2.10.3/Python
-# RUN python3 configure.py --pyqt=PyQt5
-#  && make
-#  && make install
+WORKDIR /root
+RUN curl -s -S -O https://svwh.dl.sourceforge.net/project/pyqt/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz \
+ && tar xzf PyQt5_gpl-5.9.2.tar.gz
+WORKDIR /root/PyQt5_gpl-5.9.2
+RUN apt-get install -y qt5-qmake \
+ && python3 configure.py --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtSql --enable QtSvg \
+ && make \
+ && make install
+
+WORKDIR /root
+RUN curl -s -S -O https://cfhcable.dl.sourceforge.net/project/pyqt/QScintilla2/QScintilla-2.10.3/QScintilla_gpl-2.10.3.tar.gz \
+ && tar xzf QScintilla_gpl-2.10.3.tar.gz
+WORKDIR /root/QScintilla_gpl-2.10.3/Python
+RUN python3 configure.py --pyqt=PyQt5 \
+ && make \
+ && make install
 
 WORKDIR /root