diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-12-03 14:34:40 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-12-03 15:38:36 +0100 |
| commit | 673e87f6516917d5c45a1c96c7a9c56ed6fef2cc (patch) | |
| tree | b98b8d3aa2a9fb849cd2ef08fcd58e1606fe0a96 /docker/linux | |
| parent | 0c8eeea665a783b8fe82c2b6d9f01cad6cb1054e (diff) | |
| download | qtlocation-mapboxgl-673e87f6516917d5c45a1c96c7a9c56ed6fef2cc.tar.gz | |
[build] refactor Docker scripts + add clang-tidy script
Diffstat (limited to 'docker/linux')
| -rw-r--r-- | docker/linux/Dockerfile | 13 | ||||
| -rwxr-xr-x | docker/linux/run.sh (renamed from docker/linux/run-gcc.sh) | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 36eaeed695..4c97d946e3 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -1,14 +1,7 @@ -FROM ubuntu:12.04 +FROM mapbox/gl-native:travis -# 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 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 && \ - 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 +# Install compiler +RUN apt-get -y install gdb g++-4.9 gcc-4.9 libllvm3.4 RUN useradd -ms /bin/bash mapbox USER mapbox diff --git a/docker/linux/run-gcc.sh b/docker/linux/run.sh index 91bbee64ae..3d41843cf2 100755 --- a/docker/linux/run-gcc.sh +++ b/docker/linux/run.sh @@ -3,6 +3,8 @@ set -e set -o pipefail +./docker/build.sh + docker build -t mapbox/gl-native:linux docker/linux docker run \ |