Skip to content
Permalink
Browse files

use cmake 3.10 in Docker dependency image

this should make Travis log nicer to read
thanks to @m-kuhn patch to cmake
see https://gitlab.kitware.com/cmake/cmake/merge_requests/1133
  • Loading branch information
3nids committed Dec 18, 2017
1 parent 753b3e0 commit e678bfa042e7ebec7dbab75408039c6090c121f9
Showing with 6 additions and 2 deletions.
  1. +6 −2 .docker/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update \
ca-certificates \
ccache \
clang \
cmake \
# cmake \
curl \
dh-python \
flex \
@@ -88,13 +88,17 @@ RUN apt-get update \
future \
termcolor \
&& apt-get autoremove -y python3-pip python2.7 \
&& apt-get clean
&& apt-get clean \
&& curl -s -S -O https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz \

This comment has been minimized.

Copy link
@jef-n

jef-n Feb 19, 2018

Member

Intentional? bionic has cmake 3.10.2

This comment has been minimized.

Copy link
@3nids

3nids Feb 19, 2018

Author Member

not at all. I thought it was 3.9 when I looked. I'll remove this.

&& tar --strip-components=1 -zx -f cmake-3.10.1-Linux-x86_64.tar.gz -C /usr/local \
&& rm cmake-3.10.1-Linux-x86_64.tar.gz

RUN echo "alias python=python3" >> ~/.bash_aliases

ENV CC=/usr/lib/ccache/clang
ENV CXX=/usr/lib/ccache/clang++
ENV QT_SELECT=5
ENV LANG=C.UTF-8
ENV PATH="/usr/local/bin:${PATH}"

CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

0 comments on commit e678bfa

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