regroup env vars

qgis · Feb 8, 2021 · 54538eb8c1231402f09b3b1b3156edeb46e6de80 · 54538eb
1 parent 38a4eaa
commit 54538eb8c1231402f09b3b1b3156edeb46e6de80
Unified Split

Showing with 3 additions and 2 deletions.

+1 −0 .docker/docker-variables.env

+2 −2 .docker/qgis3-build-deps.dockerfile
diff --git a/.docker/docker-variables.env b/.docker/docker-variables.env
@@ -14,4 +14,5 @@ QGIS_NO_OVERRIDE_IMPORT=1
 QGIS_CONTINUOUS_INTEGRATION_RUN=true
 TRAVIS=true
 
+LANG=C.UTF-8
 LC_ALL=en_US.UTF-8
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -179,6 +179,6 @@ RUN curl -k https://downloads.kdab.com/clazy/1.6/Clazy-x86_64-1.6.AppImage -o /t
   && ln -s /opt/clazy/squashfs-root/AppRun /usr/bin/clazy \
   && ln -s ../../bin/ccache /usr/lib/ccache/clazy
 
-ENV QT_SELECT=5
-ENV LANG=C.UTF-8
 ENV PATH="/usr/local/bin:${PATH}"
+
+# environment variables shall be located in .docker/docker-variables.env