@@ -24,31 +24,13 @@ RUN --mount=type=cache,target=/var/lib/apt/lists,id=apt-list \
2424 && apt-get update \
2525 && echo 'Install packages from https://github.com/qgis/QGIS/blob/<branch>/INSTALL.md \
2626 Remove already in GDAL image: proj, GDAL ->: \
27- gdal-bin python3-gdal python3-pyproj libgdal-dev libproj-dev \
28- Remove error with SIP v6: sip-tools python3-pyqtbuild \
29- Add other: python3-sip-dev' \
27+ gdal-bin python3-gdal libgdal-dev libproj-dev \
28+ Remove error with SIP v6: sip-tools python3-pyqtbuild' \
3029 && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
31- bison build-essential ca-certificates ccache cmake cmake-curses-gui dh-python doxygen expect flex \
32- flip git graphviz grass-dev libdraco-dev libexiv2-dev libexpat1-dev libfcgi-dev \
33- libgeos-dev libgsl-dev libpq-dev libprotobuf-dev libqca-qt6-2-dev \
34- libqca-qt6-2-plugins libqscintilla2-qt6-dev libqt6opengl6-dev libqt6serialport6-dev \
35- libqt6sql6-sqlite libqt6svg6-dev libqt6webkit6-dev libqt6xmlpatterns6-dev libqwt-qt6-dev \
36- libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl \
37- libzip-dev libzstd-dev lighttpd locales ninja-build ocl-icd-opencl-dev opencl-headers pandoc \
38- pkg-config poppler-utils protobuf-compiler pyqt6-dev pyqt6-dev-tools pyqt6.qsci-dev python3-all-dev \
39- python3-autopep8 python3-dev python3-jinja2 python3-lxml python3-mock python3-nose2 \
40- python3-owslib python3-plotly python3-psycopg2 python3-pygments python3-pyqt6 \
41- python3-pyqt6.qsci python3-pyqt6.qtmultimedia python3-pyqt6.qtpositioning \
42- python3-pyqt6.qtserialport python3-pyqt6.qtsql python3-pyqt6.qtsvg python3-pyqt6.qtwebkit \
43- python3-sip python3-termcolor python3-yaml qt6-3d-assimpsceneimport-plugin \
44- qt6-3d-defaultgeometryloader-plugin qt6-3d-gltfsceneio-plugin qt6-3d-scene2d-plugin \
45- qt6-3d-dev qt6-base-dev qt6-base-private-dev qtkeychain-qt6-dev qt6-multimedia-dev qt6-positioning-dev \
46- qt6-tools-dev qt6-tools-dev-tools spawn-fcgi xauth xfonts-100dpi xfonts-75dpi xfonts-base \
47- xfonts-scalable xvfb \
48- python3-sip-dev \
30+ bison build-essential ca-certificates ccache cmake cmake-curses-gui dh-python expect flex flip git graphviz grass-dev libdraco-dev libexiv2-dev libexpat1-dev libfcgi-dev libgeos-dev libgsl-dev libmeshoptimizer-dev libpq-dev libprotobuf-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqca-qt6-dev libqca-qt6-plugins libqscintilla2-qt5-dev libqscintilla2-qt6-dev libqt5opengl5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5xmlpatterns5-dev libsfcgal-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libyaml-tiny-perl libzip-dev libzstd-dev lighttpd locales ninja-build nlohmann-json3-dev ocl-icd-opencl-dev opencl-headers pandoc pkgconf poppler-utils protobuf-compiler pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev pyqt6-dev pyqt6-dev-tools pyqt6.qsci-dev python3-all-dev python3-autopep8 python3-dev python3-matplotlib python3-mock python3-nose2 python3-owslib python3-packaging python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtmultimedia python3-pyqt5.qtpositioning python3-pyqt5.qtserialport python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-pyqt6 python3-pyqt6.qsci python3-pyqt6.qtmultimedia python3-pyqt6.qtpositioning python3-pyqt6.qtserialport python3-pyqt6.qtsvg python3-pyqt6.sip python3-pyqtbuild python3-termcolor python3-yaml qt3d-assimpsceneimport-plugin qt3d-defaultgeometryloader-plugin qt3d-gltfsceneio-plugin qt3d-scene2d-plugin qt3d5-dev qt6-3d-assimpsceneimport-plugin qt6-3d-defaultgeometryloader-plugin qt6-3d-dev qt6-3d-gltfsceneio-plugin qt6-3d-scene2d-plugin qt6-5compat-dev qt6-base-dev qt6-base-private-dev qt6-multimedia-dev qt6-positioning-dev qt6-serialport-dev qt6-svg-dev qt6-tools-dev qt6-tools-dev-tools qt6-webengine-dev qtbase5-dev qtbase5-private-dev qtkeychain-qt5-dev qtkeychain-qt6-dev qtmultimedia5-dev qtpositioning5-dev qttools5-dev qttools5-dev-tools sip-tools spawn-fcgi xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb \
4931 && echo 'Install some more packages' \
5032 && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
51- gnupg gcc clang "nodejs=${NODE_MAJOR}.*"
33+ gnupg gcc clang "nodejs=${NODE_MAJOR}.*" python3-sip-dev
5234
5335WORKDIR /usr/lib/
5436COPY package.json package-lock.json ./
@@ -158,13 +140,13 @@ RUN --mount=type=cache,target=/var/lib/apt/lists,id=apt-list \
158140 apt-get update \
159141 && DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --no-install-recommends \
160142 python3 python3-pip \
161- python3-pyqt6 python3-pyqt6.qtsql python3-pyqt6. qsci python3-pyqt6.qtpositioning \
143+ python3-pyqt6 python3-pyqt6.qsci python3-pyqt6.qtpositioning \
162144 python3-pyqt6.qtmultimedia python3-pyqt6.qtserialport \
163145 xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb \
164146 spawn-fcgi xauth apache2 libapache2-mod-fcgid binutils glibc-tools ocl-icd-libopencl1 \
165- libfcgi libgslcblas0 libqca-qt6-2 libqca-qt6-2-plugins libzip4 \
166- libqt6opengl6 libqt6sql6-sqlite libqt6concurrent6 libqt6positioning6 libqt6script6 \
167- libqt6webkit6 libqwt-qt6-6 libspatialindex6 libspatialite8t64 libsqlite3-0 libqt6keychain1 \
147+ libfcgi libgslcblas0 libqca-qt6-2 libzip4 \
148+ libqt6opengl6 libqt6sql6-sqlite libqt6concurrent6 libqt6positioning6 \
149+ libspatialindex6 libspatialite8t64 libsqlite3-0 libqt6keychain1 \
168150 libqt6serialport6 libqt6quickwidgets6 libexiv2-27 libprotobuf32t64 libprotobuf-lite32t64 \
169151 libgsl27 libzstd1 libdraco8 libqt6multimediawidgets6
170152
0 commit comments