Browse Source

python2: Remove python2 dependency from docs and dockerfiles

travis-debug
Christian Decker 5 years ago
committed by Rusty Russell
parent
commit
7f6f324590
  1. 2
      Dockerfile
  2. 1
      contrib/Dockerfile.builder
  3. 1
      contrib/Dockerfile.builder.fedora
  4. 2
      contrib/linuxarm32v7.Dockerfile
  5. 2
      contrib/linuxarm64v8.Dockerfile
  6. 3
      doc/INSTALL.md

2
Dockerfile

@ -48,7 +48,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \
FROM debian:stretch-slim as builder FROM debian:stretch-slim as builder
ENV LIGHTNINGD_VERSION=master 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 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential git libtool python3 python3-mako wget gnupg dirmngr git gettext
RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \ RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \
&& tar xvf zlib-1.2.11.tar.gz \ && tar xvf zlib-1.2.11.tar.gz \

1
contrib/Dockerfile.builder

@ -24,7 +24,6 @@ RUN apt-get -qq update && \
libsqlite3-dev \ libsqlite3-dev \
libgmp-dev \ libgmp-dev \
git \ git \
python \
python3 \ python3 \
valgrind \ valgrind \
net-tools \ net-tools \

1
contrib/Dockerfile.builder.fedora

@ -11,7 +11,6 @@ RUN dnf update -y && \
clang \ clang \
gmp-devel \ gmp-devel \
libsq3-devel \ libsq3-devel \
python2-devel \
python3-devel \ python3-devel \
python3-mako \ python3-mako \
python3-pip \ python3-pip \

2
contrib/linuxarm32v7.Dockerfile

@ -48,7 +48,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \
FROM debian:stretch-slim as builder FROM debian:stretch-slim as builder
ENV LIGHTNINGD_VERSION=master ENV LIGHTNINGD_VERSION=master
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python python3 python3-mako wget gnupg dirmngr git \ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python3 python3-mako wget gnupg dirmngr git \
libc6-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
ENV target_host=arm-linux-gnueabihf ENV target_host=arm-linux-gnueabihf

2
contrib/linuxarm64v8.Dockerfile

@ -48,7 +48,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \
FROM debian:stretch-slim as builder FROM debian:stretch-slim as builder
ENV LIGHTNINGD_VERSION=master ENV LIGHTNINGD_VERSION=master
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python python3 python3-mako wget gnupg dirmngr git \ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python3 python3-mako wget gnupg dirmngr git \
libc6-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
ENV target_host=aarch64-linux-gnu ENV target_host=aarch64-linux-gnu

3
doc/INSTALL.md

@ -36,7 +36,7 @@ Get dependencies:
sudo apt-get update sudo apt-get update
sudo apt-get install -y \ sudo apt-get install -y \
autoconf automake build-essential git libtool libgmp-dev \ autoconf automake build-essential git libtool libgmp-dev \
libsqlite3-dev python python3 python3-mako net-tools zlib1g-dev libsodium-dev \ libsqlite3-dev python3 python3-mako net-tools zlib1g-dev libsodium-dev \
gettext gettext
If you don't have Bitcoin installed locally you'll need to install that If you don't have Bitcoin installed locally you'll need to install that
@ -88,7 +88,6 @@ $ sudo dnf update -y && \
git \ git \
gmp-devel \ gmp-devel \
libsq3-devel \ libsq3-devel \
python2-devel \
python3-devel \ python3-devel \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \

Loading…
Cancel
Save