try to remove sip-dev only

qgis · Apr 5, 2018 · e52b231 · e52b231
1 parent feed623
commit e52b231
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -20,31 +20,31 @@ WORKDIR /root/sip419
 RUN sed -i -r "s/RM_HEXVERSION = '04ffff'/RM_HEXVERSION = '041308'/; s/RM_RELEASE = '4.255.255'/RM_RELEASE = '4.19.8'/" build.py
 #RUN python3 build.py prepare && python3 configure.py && make && make install
 
-RUN apt-get install -y python3-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
-RUN tar xzf PyQt5_gpl-5.9.2.tar.gz
-WORKDIR /root/PyQt5_gpl-5.9.2
-RUN  apt-get update
-RUN apt-get install -y qt5-qmake
-RUN apt-get install -y g++
-RUN apt-get install -y flex bison
-RUN apt-get install -y python3-dev
-
-WORKDIR /root/sip419
-RUN python3 build.py prepare && python3 configure.py && make && make install
-
-RUN apt-get install -y qt5-default
-RUN apt-get install -y libqt5svg5-dev
-WORKDIR /root/PyQt5_gpl-5.9.2
-RUN python3 configure.py --verbose --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtGui --enable QtSvg --enable QtSql
-RUN 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
-RUN tar xzf QScintilla_gpl-2.10.3.tar.gz
-WORKDIR /root/QScintilla_gpl-2.10.3/Python
-# RUN python3 configure.py --pyqt=PyQt5
-# RUN make
-# RUN make install
+# RUN apt-get install -y python3-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
+# RUN tar xzf PyQt5_gpl-5.9.2.tar.gz
+# WORKDIR /root/PyQt5_gpl-5.9.2
+# RUN  apt-get update
+# RUN apt-get install -y qt5-qmake
+# RUN apt-get install -y g++
+# RUN apt-get install -y flex bison
+# RUN apt-get install -y python3-dev
+#
+# WORKDIR /root/sip419
+# RUN python3 build.py prepare && python3 configure.py && make && make install
+#
+# RUN apt-get install -y qt5-default
+# RUN apt-get install -y libqt5svg5-dev
+# WORKDIR /root/PyQt5_gpl-5.9.2
+# RUN python3 configure.py --verbose --confirm-license --qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake --qsci-api --enable QtGui --enable QtSvg --enable QtSql
+# RUN 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
+# RUN tar xzf QScintilla_gpl-2.10.3.tar.gz
+# WORKDIR /root/QScintilla_gpl-2.10.3/Python
+# # RUN python3 configure.py --pyqt=PyQt5
+# # RUN make
+# # RUN make install
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -94,7 +94,7 @@ RUN  apt-get update \
     mock \
     future \
     termcolor \
-  && apt-get autoremove -y python3-pip python2.7 \
+  && apt-get autoremove -y python3-pip python2.7 sip-dev \
   && apt-get clean
 
   RUN bash -c "echo $(sip -V)"