Merge pull request mapbox#488 from mapbox/test-centos7

Test on centos7 via docker
KingElimy · Nov 10, 2017 · f1c3811 · f1c3811
2 parents 450032a + 95cc167
commit f1c3811
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,3 +2,4 @@
 .gitignore
 .git
 Dockerfile
+Dockerfile.centos7
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,20 @@ sudo: false
 
 matrix:
   include:
-    # test on docker
+    # test on docker+centos7
+    - os: linux
+      compiler: clang
+      services:
+       - docker
+      sudo: true
+      dist: trusty
+      env: DOCKERFILE=Dockerfile.centos7
+      before_install: []
+      install:
+        - docker build -t tippecanoe-image -f ${DOCKERFILE} .
+      script:
+        - docker run -it tippecanoe-image
+    # test on docker+ubuntu
     - os: linux
       compiler: clang
       services:

diff --git a/Dockerfile b/Dockerfile
@@ -15,5 +15,5 @@ COPY . /tmp/tippecanoe-src
 RUN make \
   && make install
 
-# Run the default command to show usage
+# Run the tests
 CMD make test
diff --git a/Dockerfile.centos7 b/Dockerfile.centos7
@@ -0,0 +1,15 @@
+FROM centos:7
+
+RUN yum install -y make sqlite-devel zlib-devel bash git gcc-c++
+
+# Create a directory and copy in all files
+RUN mkdir -p /tmp/tippecanoe-src
+WORKDIR /tmp/tippecanoe-src
+COPY . /tmp/tippecanoe-src
+
+# Build tippecanoe
+RUN make \
+  && make install
+
+# Run the tests
+CMD make test