From 0d55dca50f71681ed68898ba8d782e8cc9ed3df7 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 26 Sep 2019 10:54:43 +0900 Subject: [PATCH] Revert "docker: Use system libraries, don't bring your own" This reverts commit 48728d3828d96f6bc32b98496aa845963f012846. --- Dockerfile | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8e2f83624cd..f58563a99f34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,26 +48,29 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \ FROM debian:stretch-slim as builder ENV LIGHTNINGD_VERSION=master -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - autoconf \ - automake \ - build-essential \ - git \ - libtool \ - python \ - python3 \ - python3-mako \ - wget \ - gnupg \ - dirmngr \ - git \ - gettext \ - unzip \ - tclsh \ - libsqlite3-dev \ - libgmp-dev \ - zlib1g-dev +RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential git libtool python python3 python3-mako wget gnupg dirmngr git gettext + +RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \ +&& tar xvf zlib-1.2.11.tar.gz \ +&& cd zlib-1.2.11 \ +&& ./configure \ +&& make \ +&& make install && cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 + +RUN apt-get install -y --no-install-recommends unzip tclsh \ +&& wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip \ +&& unzip sqlite-src-3260000.zip \ +&& cd sqlite-src-3260000 \ +&& ./configure --enable-static --disable-readline --disable-threadsafe --disable-load-extension \ +&& make \ +&& make install && cd .. && rm sqlite-src-3260000.zip && rm -rf sqlite-src-3260000 + +RUN wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz \ +&& tar xvf gmp-6.1.2.tar.xz \ +&& cd gmp-6.1.2 \ +&& ./configure --disable-assembly \ +&& make \ +&& make install && cd .. && rm gmp-6.1.2.tar.xz && rm -rf gmp-6.1.2 WORKDIR /opt/lightningd COPY . /tmp/lightning @@ -79,12 +82,7 @@ RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVE FROM debian:stretch-slim as final COPY --from=downloader /opt/tini /usr/bin/tini -RUN apt-get update && apt-get install -y --no-install-recommends \ - socat \ - inotify-tools \ - libgmp10 \ - libsqlite3-0 \ - zlib1g \ +RUN apt-get update && apt-get install -y --no-install-recommends socat inotify-tools \ && rm -rf /var/lib/apt/lists/* ENV LIGHTNINGD_DATA=/root/.lightning