From 17eeaac196d7b519aea1a15dcde83fb014a12045 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Wed, 28 Nov 2018 20:34:51 -0500 Subject: [PATCH 1/2] Remove zlib from Dockerfiles --- Dockerfile.debian.9-x64 | 2 +- Dockerfile.ubuntu.18.04-x64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.debian.9-x64 b/Dockerfile.debian.9-x64 index f9d7f60b..5125004d 100644 --- a/Dockerfile.debian.9-x64 +++ b/Dockerfile.debian.9-x64 @@ -2,6 +2,6 @@ FROM debian:9 WORKDIR /nativebinaries COPY . /nativebinaries/ -RUN apt update && apt -y install cmake gcc libssl-dev pkg-config zlib1g-dev +RUN apt update && apt -y install cmake gcc libssl-dev pkg-config CMD ["/bin/bash", "-c", "./build.libgit2.sh"] diff --git a/Dockerfile.ubuntu.18.04-x64 b/Dockerfile.ubuntu.18.04-x64 index 09a039a8..3d475832 100644 --- a/Dockerfile.ubuntu.18.04-x64 +++ b/Dockerfile.ubuntu.18.04-x64 @@ -2,6 +2,6 @@ FROM ubuntu:18.04 WORKDIR /nativebinaries COPY . /nativebinaries/ -RUN apt update && apt -y install cmake libssl-dev pkg-config zlib1g-dev +RUN apt update && apt -y install cmake libssl-dev pkg-config CMD ["/bin/bash", "-c", "./build.libgit2.sh"] From 1772c5093d4d507458a23cc7b5d390a29e99a096 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Wed, 28 Nov 2018 20:39:09 -0500 Subject: [PATCH 2/2] Use bundled zlib --- build.libgit2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.libgit2.sh b/build.libgit2.sh index 80c6950e..861eeb3c 100755 --- a/build.libgit2.sh +++ b/build.libgit2.sh @@ -15,6 +15,7 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \ -DENABLE_TRACE=ON \ -DLIBGIT2_FILENAME=git2-$SHORTSHA \ -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \ + -DUSE_BUNDLED_ZLIB=ON \ .. cmake --build .