Skip to content

Commit e678bfa

Browse files
committedDec 18, 2017
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
1 parent 753b3e0 commit e678bfa

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed
 

‎.docker/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN apt-get update \
1212
ca-certificates \
1313
ccache \
1414
clang \
15-
cmake \
15+
# cmake \
1616
curl \
1717
dh-python \
1818
flex \
@@ -88,13 +88,17 @@ RUN apt-get update \
8888
future \
8989
termcolor \
9090
&& apt-get autoremove -y python3-pip python2.7 \
91-
&& apt-get clean
91+
&& apt-get clean \
92+
&& curl -s -S -O https://cmake.org/files/v3.10/cmake-3.10.1-Linux-x86_64.tar.gz \
Code has comments. Press enter to view.
93+
&& tar --strip-components=1 -zx -f cmake-3.10.1-Linux-x86_64.tar.gz -C /usr/local \
94+
&& rm cmake-3.10.1-Linux-x86_64.tar.gz
9295

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

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.