Some cleanup

m-kuhn · m-kuhn · commit 12e5b720f91b · 2017-09-28T13:22:37.000+02:00
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -17,10 +17,6 @@ set -e
 
 DIR=$(git rev-parse --show-toplevel)/.docker
 
-docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
-
 mkdir -p $CCACHE_DIR
 
 docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
-
-popd
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -3,8 +3,6 @@ MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
 
-ENV CORES 8
-
 RUN  apt-get update \
   && apt-get install -y software-properties-common \
   && add-apt-repository ppa:ubuntugis/ubuntugis-unstable \
@@ -100,13 +98,4 @@ ENV CXX=/usr/lib/ccache/clang++
 ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 
-# RUN cmake --version
-# RUN ${CC} --version
-# RUN ${CXX} --version
-
-# RUN locale-gen en_US.UTF-8
-# ENV LANG=en_US.UTF-8
-# ENV LANGUAGE=en_US:en
-# ENV LC_ALL=en_US.UTF-8
-
 CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
