[core] update docker script

[skip ci]
This commit is contained in:
Konstantin Käfer
2015-10-16 13:58:01 +02:00
parent ceb67bbc77
commit b3f31e9fa2
4 changed files with 38 additions and 28 deletions

View File

@@ -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/*
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 && \
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
RUN apt-get install -y imagemagick
# Install
RUN add-apt-repository --yes ppa:ubuntu-toolchain-r/test && \
apt-get update -y && \
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

View File

@@ -1,15 +0,0 @@
#!/usr/bin/env bash
set -e
set -o pipefail
docker build \
-t mapbox/gl-native:linux \
docker/linux
docker run \
-i \
-e "CXX=clang++" \
-v `pwd`:/home/mapbox/build \
-t mapbox/gl-native:linux \
build/docker/linux/test.sh

View File

@@ -3,13 +3,10 @@
set -e
set -o pipefail
docker build \
-t mapbox/gl-native:linux \
docker/linux
docker build -t mapbox/gl-native:linux docker/linux
docker run \
-i \
-e "CXX=g++" \
-v `pwd`:/home/mapbox/build \
-t mapbox/gl-native:linux \
build/docker/linux/test.sh

26
docker/linux/test.sh Executable file
View File

@@ -0,0 +1,26 @@
#!/usr/bin/env bash
# set -e
# set -o pipefail
export FLAVOR=linux
export CXX=g++-4.9
export BUILDTYPE=Release
# Node
. ~/.nvm/nvm.sh
nvm use 0.10
# Xvfb
start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset
cd build
# before_install
source ./scripts/travis_helper.sh
# install
./scripts/${FLAVOR}/install.sh
# script
./scripts/${FLAVOR}/run.sh