summaryrefslogtreecommitdiff
path: root/docker/linux/Dockerfile
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-10-16 13:58:01 +0200
committerKonstantin Käfer <mail@kkaefer.com>2015-10-16 13:58:01 +0200
commitb3f31e9fa222f7e02c2130a748dd283a73b270f2 (patch)
treec420a74dd6c817c9d67b21eee0475987af73d2e5 /docker/linux/Dockerfile
parentceb67bbc77bf5f4bd58e40fa9579e21c26548ebd (diff)
downloadqtlocation-mapboxgl-b3f31e9fa222f7e02c2130a748dd283a73b270f2.tar.gz
[core] update docker script
[skip ci]
Diffstat (limited to 'docker/linux/Dockerfile')
-rw-r--r--docker/linux/Dockerfile18
1 files changed, 10 insertions, 8 deletions
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
index 0d23fe1e79..36eaeed695 100644
--- a/docker/linux/Dockerfile
+++ b/docker/linux/Dockerfile
@@ -1,19 +1,21 @@
FROM ubuntu:12.04
+# Recreate Travis CI environment
RUN apt-get update -y && \
- apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common && \
- rm -rf /var/lib/apt/lists/*
+ apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common curl zlib1g-dev automake libtool make cmake pkg-config python-pip libcurl4-openssl-dev libpng-dev libsqlite3-dev xvfb libglu1-mesa-dev libxrandr-dev libxinerama-dev libxi-dev libxcursor-dev imagemagick && \
+ pip install awscli
+# Install
RUN add-apt-repository --yes ppa:ubuntu-toolchain-r/test && \
- add-apt-repository --yes ppa:boost-latest/ppa && \
apt-get update -y && \
- apt-get -y install gcc-4.8 g++-4.8 curl zlib1g-dev automake gdb libtool xutils-dev make cmake pkg-config python-pip libboost1.55-dev libcurl4-openssl-dev libpng-dev libsqlite3-dev mesa-utils libxi-dev x11proto-randr-dev x11proto-xext-dev libxrandr-dev x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev libxinerama-dev xvfb llvm-3.4 && \
- pip install awscli
-
-RUN apt-get install -y imagemagick
+ apt-get -y install gdb g++-4.9 gcc-4.9 libllvm3.4 xutils-dev libxxf86vm-dev x11proto-xf86vidmode-dev mesa-utils
RUN useradd -ms /bin/bash mapbox
-
USER mapbox
ENV HOME /home/mapbox
WORKDIR /home/mapbox
+
+# Node
+RUN git clone https://github.com/creationix/nvm.git ~/.nvm && \
+ . ~/.nvm/nvm.sh && \
+ NVM_DIR=~/.nvm nvm install 0.10