summaryrefslogtreecommitdiff
path: root/docker/linux/Dockerfile
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-05-26 13:32:23 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-05-26 14:26:01 +0200
commitd5e62136b24c09f96c9e9e63d851cdfd41a7fb88 (patch)
treea043610a4fb163f7538b41a292b3af2f47be41d2 /docker/linux/Dockerfile
parentf4ebda09bea82146a0754d319b031cf62c0023e1 (diff)
downloadqtlocation-mapboxgl-d5e62136b24c09f96c9e9e63d851cdfd41a7fb88.tar.gz
[docker] upgrade docker scripts [skip ci]
Diffstat (limited to 'docker/linux/Dockerfile')
-rw-r--r--docker/linux/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
index 4c97d946e3..c797082d93 100644
--- a/docker/linux/Dockerfile
+++ b/docker/linux/Dockerfile
@@ -1,7 +1,7 @@
FROM mapbox/gl-native:travis
# Install compiler
-RUN apt-get -y install gdb g++-4.9 gcc-4.9 libllvm3.4
+RUN apt-get -y install gdb g++-5 gcc-5 libllvm3.4
RUN useradd -ms /bin/bash mapbox
USER mapbox
@@ -11,4 +11,4 @@ WORKDIR /home/mapbox
# Node
RUN git clone https://github.com/creationix/nvm.git ~/.nvm && \
. ~/.nvm/nvm.sh && \
- NVM_DIR=~/.nvm nvm install 0.10
+ NVM_DIR=~/.nvm nvm install 4.4.5