mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

doc: remove mrkd requirement, add lowdown requirement.

Browse Source 
I guessed it's called "lowdown" for everyone?

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2022-09-06 06:57:55 +09:30 committed by neil saitug
parent 2e48722f37
commit 50056ce918
8 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/bsd.yml vendored
View File

@ -39,6 +39,7 @@ jobs:
bash \
gettext \
sqlite3 \
lowdown \
curl
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2021-08-3z1
@ -63,7 +64,6 @@ jobs:
blinker \
flake8 \
mako \
mrkd \
pytest-sentry \
pytest-test-groups==1.0.3 \
pytest-custom-exit-code==0.3.0 \

3
contrib/docker/Dockerfile.alpine
View File

@ -6,7 +6,7 @@ WORKDIR /build
RUN apk update && \
apk add ca-certificates alpine-sdk autoconf automake git libtool \
gmp-dev sqlite-dev python3 py3-mako net-tools zlib-dev libsodium gettext su-exec \
python3 py3-pip #&& \
python3 py3-pip lowdown #&& \
#apk add --upgrade fortify-headers
RUN mkdir lightning
@ -15,7 +15,6 @@ COPY . lightning
RUN cd lightning && \
git submodule update --init --recursive && \
./configure && \
pip3 install mrkd mistune==0.8.4 && \
make -j$(nproc) && \
make install

4
contrib/docker/Dockerfile.builder
View File

@ -33,6 +33,7 @@ RUN apt-get -qq update && \
python-pkg-resources \
shellcheck \
libxml2-utils \
lowdown \
wget \
gettext \
xsltproc \
@ -65,5 +66,4 @@ RUN pip3 install --upgrade pip && \
tqdm==4.26.0 \
pytest-test-groups==1.0.3 \
flake8==3.5.0 \
pytest-rerunfailures==3.1 \
mrkd==0.1.6
pytest-rerunfailures==3.1

2
contrib/docker/Dockerfile.builder.fedora
View File

@ -32,4 +32,4 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_
rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION
RUN python3 -m pip install --upgrade pip && \
python3 -m pip install python-bitcoinlib==0.10.2 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0 mrkd==0.1.6
python3 -m pip install python-bitcoinlib==0.10.2 pytest==3.0.5 setuptools==36.6.0 pytest-test-groups==1.0.3 flake8==3.5.0 pytest-rerunfailures==3.1 ephemeral-port-reserve==1.1.0

3
contrib/docker/linuxarm32v7.Dockerfile
View File

@ -48,7 +48,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \
FROM debian:buster-slim as builder
ENV LIGHTNINGD_VERSION=master
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python3 python3-pip python3-setuptools 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-pip python3-setuptools python3-mako wget gnupg dirmngr git lowdown \
libc6-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
ENV target_host=arm-linux-gnueabihf
@ -92,7 +92,6 @@ RUN git clone --recursive /tmp/lightning . && \
ARG DEVELOPER=0
ENV PYTHON_VERSION=3
RUN pip3 install mrkd
RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install
FROM arm32v7/debian:buster-slim as final

3
contrib/docker/linuxarm64v8.Dockerfile
View File

@ -48,7 +48,7 @@ RUN mkdir /opt/litecoin && cd /opt/litecoin \
FROM debian:buster-slim as builder
ENV LIGHTNINGD_VERSION=master
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates autoconf automake build-essential gettext git libtool python3 python3-pip python3-setuptools 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-pip python3-setuptools python3-mako wget gnupg dirmngr git lowdown \
libc6-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
ENV target_host=aarch64-linux-gnu
@ -91,7 +91,6 @@ RUN git clone --recursive /tmp/lightning . && \
ARG DEVELOPER=0
ENV PYTHON_VERSION=3
RUN pip3 install mrkd
RUN ./configure --prefix=/tmp/lightning_install --enable-static && make -j3 DEVELOPER=${DEVELOPER} && make install
FROM arm64v8/debian:buster-slim as final

10
doc/INSTALL.md
View File

@ -64,7 +64,7 @@ Checkout a release tag:
For development or running tests, get additional dependencies:
sudo apt-get install -y valgrind libpq-dev shellcheck cppcheck \
libsecp256k1-dev jq
libsecp256k1-dev jq lowdown
If you want to build the Rust plugins (currently, cln-grpc):
@ -174,12 +174,6 @@ fiddle with compile time options:
# cd /usr/ports/net-p2p/c-lightning && make install
mrkd is required to build man pages from markdown files (not done by the port):
# cd /usr/ports/devel/py-pip && make install
$ pip install --user poetry
$ poetry install
See `/usr/ports/net-p2p/c-lightning/Makefile` for instructions on how to
build from an arbitrary git commit, instead of the latest release tag.
@ -209,7 +203,7 @@ pkg_add git python gmake py3-pip libtool gmp
pkg_add automake # (select highest version, automake1.16.2 at time of writing)
pkg_add autoconf # (select highest version, autoconf-2.69p2 at time of writing)
```
Install `mako` and `mrkd` otherwise we run into build errors:
Install `mako` otherwise we run into build errors:
```
pip3.7 install --user poetry
poetry install

1
pyproject.toml
View File

@ -10,7 +10,6 @@ python = "^3.7"
pyln-client = { path = "./contrib/pyln-client", develop = true }
pyln-proto = { path = "./contrib/pyln-proto", develop = true }
Mako = "^1.1.6"
mrkd = { git = "https://github.com/refi64/mrkd.git", rev = "781f05eb9898ca652f18eed29b3c956389e6a2a7" }
websocket-client = "^1.2.3"
grpcio-tools = "^1.44.0"