diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh index 7042d9c0f5ae..ec4d47c50448 100755 --- a/.docker/docker-qgis-build.sh +++ b/.docker/docker-qgis-build.sh @@ -115,8 +115,8 @@ cmake \ -DWITH_QTWEBKIT=${WITH_QT5} \ -DWITH_QTWEBENGINE=${WITH_QTWEBENGINE} \ -DWITH_PDF4QT=${WITH_PDF4QT} \ - -DORACLE_INCLUDEDIR=/instantclient_19_9/sdk/include/ \ - -DORACLE_LIBDIR=/instantclient_19_9/ \ + -DORACLE_INCLUDEDIR=/instantclient_21_16/sdk/include/ \ + -DORACLE_LIBDIR=/instantclient_21_16/ \ -DDISABLE_DEPRECATED=ON \ -DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s" \ -DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \ diff --git a/.docker/qgis3-qt5-build-deps.dockerfile b/.docker/qgis3-qt5-build-deps.dockerfile index 61dcba09ffc5..0249746f3bca 100644 --- a/.docker/qgis3-qt5-build-deps.dockerfile +++ b/.docker/qgis3-qt5-build-deps.dockerfile @@ -120,16 +120,16 @@ RUN apt-get install -y nodejs RUN corepack enable # Oracle : client side -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-basic-linux.x64-19.9.0.0.0dbru.zip > instantclient-basic-linux.x64-19.9.0.0.0dbru.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip > instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip > instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basic-linux.x64-21.16.0.0.0dbru.zip > instantclient-basic-linux.x64-21.16.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip > instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip > instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip -RUN unzip instantclient-basic-linux.x64-19.9.0.0.0dbru.zip -RUN unzip instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip -RUN unzip instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip +RUN unzip -n instantclient-basic-linux.x64-21.16.0.0.0dbru.zip +RUN unzip -n instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip +RUN unzip -n instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip -ENV PATH="/instantclient_19_9:${PATH}" -ENV LD_LIBRARY_PATH="/instantclient_19_9:${LD_LIBRARY_PATH}" +ENV PATH="/instantclient_21_16:${PATH}" +ENV LD_LIBRARY_PATH="/instantclient_21_16:${LD_LIBRARY_PATH}" # Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163 RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen diff --git a/.docker/qgis3-qt6-build-deps.dockerfile b/.docker/qgis3-qt6-build-deps.dockerfile index d6f0908df9b0..463bfa234fa8 100644 --- a/.docker/qgis3-qt6-build-deps.dockerfile +++ b/.docker/qgis3-qt6-build-deps.dockerfile @@ -92,16 +92,17 @@ RUN dnf -y --refresh install \ # Oracle : client side -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-basic-linux.x64-19.9.0.0.0dbru.zip > instantclient-basic-linux.x64-19.9.0.0.0dbru.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip > instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip -RUN curl https://download.oracle.com/otn_software/linux/instantclient/199000/instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip > instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basic-linux.x64-21.16.0.0.0dbru.zip > instantclient-basic-linux.x64-21.16.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip > instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip +RUN curl https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip > instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip -RUN unzip instantclient-basic-linux.x64-19.9.0.0.0dbru.zip -RUN unzip instantclient-sdk-linux.x64-19.9.0.0.0dbru.zip -RUN unzip instantclient-sqlplus-linux.x64-19.9.0.0.0dbru.zip +RUN unzip -n instantclient-basic-linux.x64-21.16.0.0.0dbru.zip +RUN unzip -n instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip +RUN unzip -n instantclient-sqlplus-linux.x64-21.16.0.0.0dbru.zip + +ENV PATH="/instantclient_21_16:${PATH}" +ENV LD_LIBRARY_PATH="/instantclient_21_16:${LD_LIBRARY_PATH}" -ENV PATH="/instantclient_19_9:${PATH}" -ENV LD_LIBRARY_PATH="/instantclient_19_9:${LD_LIBRARY_PATH}" ENV LANG=C.UTF-8 FROM binary-for-oracle as binary-only