summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-10 03:01:27 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-14 03:08:54 +0200
commit7d77a55fe05266ead14f20d49d9a19a5709d6a8e (patch)
treed8186dcb00e27223075babc438008b2e4427755a
parent09d307db14514479a8f2fbbd6e6a98496b1f23c7 (diff)
downloadqtlocation-mapboxgl-7d77a55fe05266ead14f20d49d9a19a5709d6a8e.tar.gz
[build] Bump docker
Allow building with OpenGL ES 2.0 headers on Linux.
-rw-r--r--circle.yml2
-rw-r--r--scripts/ci/Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml
index 70f74442cc..445d9c0426 100644
--- a/circle.yml
+++ b/circle.yml
@@ -200,7 +200,7 @@ executors:
ubuntu-disco:
docker:
# FIXME: Move the image to mbgl/
- - image: tmpsantos/mbgl_ci:1.7
+ - image: tmpsantos/mbgl_ci:1.8
resource_class: xlarge
working_directory: /src
environment:
diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile
index 17236f3fb4..e82c9703ef 100644
--- a/scripts/ci/Dockerfile
+++ b/scripts/ci/Dockerfile
@@ -47,6 +47,7 @@ RUN pip3 install cmake-format==0.5.5
RUN set -eu && apt-get install -y \
libcurl4-openssl-dev \
libgl1-mesa-dev \
+ libgles2-mesa-dev \
libglfw3-dev \
libicu-dev \
libjpeg-turbo8-dev \