-
Notifications
You must be signed in to change notification settings - Fork 435
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The final tippecanoe image doesn't need the compiler in it. By using a builder image, we can install the compiler and build tippecanoe, then copy the results into a smaller final image. In Travis, run a build that stops on the builder image stage so that make test can be run in the script stage. In normal usage for a user that's not necessary. Update the travis image to bionic, as trusty is now in extended maint - and the only thing these jobs are doing is running docker. While we're in there, update centos to centos8 and ubuntu to 20.04, but add build args that allow overriding that if desired. Finally, ubuntu doesn't need build-essential, which pulls in all of the tools needed to build debian packages. Like centos it just needs gcc, g++ and make.
- Loading branch information
Showing
6 changed files
with
61 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ | |
.gitignore | ||
.git | ||
Dockerfile | ||
Dockerfile.centos7 | ||
Dockerfile.centos |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
ARG CENTOS_VERSION=8 | ||
|
||
# Start from centos | ||
FROM centos:${CENTOS_VERSION} as builder | ||
|
||
# Intall dependencies | ||
RUN yum install -y make sqlite-devel zlib-devel gcc-c++ diffutils | ||
|
||
# Copy in all files | ||
WORKDIR /tmp/tippecanoe-src | ||
COPY . /tmp/tippecanoe-src | ||
|
||
# Build tippecanoe | ||
RUN make \ | ||
&& make install | ||
|
||
# Run the tests | ||
CMD make test | ||
|
||
# Build final image | ||
FROM centos:${CENTOS_VERSION} | ||
|
||
# Install runtime dependencies | ||
RUN yum install -y sqlite-libs zlib | ||
|
||
# Copy built files into final image | ||
COPY --from=builder /usr/local/ /usr/local/ |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters