From 6051c7b4b656c2b17aac0a0a103b6fe1fe4e6dde Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Tue, 18 Jun 2019 22:32:32 +0200 Subject: [PATCH] put back QT_SELECT --- .docker/qgis3-build-deps-disco.dockerfile | 1 + .docker/qgis3-build-deps.dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.docker/qgis3-build-deps-disco.dockerfile b/.docker/qgis3-build-deps-disco.dockerfile index 57bb8ade890..34ec12cdba0 100644 --- a/.docker/qgis3-build-deps-disco.dockerfile +++ b/.docker/qgis3-build-deps-disco.dockerfile @@ -129,5 +129,6 @@ RUN locale-gen RUN echo "alias python=python3" >> ~/.bash_aliases +ENV QT_SELECT=5 ENV LANG=C.UTF-8 ENV PATH="/usr/local/bin:${PATH}" diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile index 12a692c75c5..c890251aaac 100644 --- a/.docker/qgis3-build-deps.dockerfile +++ b/.docker/qgis3-build-deps.dockerfile @@ -146,6 +146,7 @@ RUN echo "alias python=python3" >> ~/.bash_aliases RUN curl -k https://orfeo-toolbox.org/qgis/OTB-Linux64.run -o /tmp/OTB-Linux64.run && sh /tmp/OTB-Linux64.run --target /opt/otb ENV OTB_INSTALL_DIR=/opt/otb +ENV QT_SELECT=5 ENV LANG=C.UTF-8 ENV PATH="/usr/local/bin:${PATH}"