sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanup

Browse Source
This commit is contained in:
Matthias Kuhn 2017-09-22 19:51:38 +02:00
parent 64ec204460
commit 12e5b720f9
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/travis/linux/script.sh
View File

@ -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

11
.docker/Dockerfile
View File

@ -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