From b3f31e9fa222f7e02c2130a748dd283a73b270f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 16 Oct 2015 13:58:01 +0200 Subject: [core] update docker script [skip ci] --- docker/linux/Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'docker/linux/Dockerfile') 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 -- cgit v1.2.1