Skip to content
Permalink
Browse files

Some cleanup

  • Loading branch information
m-kuhn committed Sep 26, 2017
1 parent e22189d commit 285a7e5cc57f6b7fa4546042f2834e44c4a636de
Showing with 0 additions and 15 deletions.
  1. +0 −4 .ci/travis/linux/script.sh
  2. +0 −11 .docker/Dockerfile
@@ -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
@@ -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

0 comments on commit 285a7e5

Please sign in to comment.
You can’t perform that action at this time.