lbrynet refactorings
* Production: Multi-stage Dockerfile. * Production: Adds VERSION ARG to specify the lbrynet version to download. * Compiler: Adds REPO ARG to specify alternate git repository to build from. * Fixes checkmount arg passing. * Adds correct binding IP address to start.sh * Adds mountable config to start.sh * Does not yet add any Layered Config like #70 (it's harder 'cause yaml)
This commit is contained in:
parent
a9b058255e
commit
bf89578fde
4 changed files with 24 additions and 20 deletions
|
@ -39,9 +39,10 @@ RUN apt-get update && \
|
||||||
|
|
||||||
FROM dependencies as compile
|
FROM dependencies as compile
|
||||||
|
|
||||||
|
ARG REPO=https://github.com/lbryio/lbry.git
|
||||||
ARG VERSION=master
|
ARG VERSION=master
|
||||||
RUN python3.7 -m pip install -U pyinstaller && \
|
RUN python3.7 -m pip install -U pyinstaller && \
|
||||||
git clone https://github.com/lbryio/lbry.git /lbry && \
|
git clone ${REPO} /lbry && \
|
||||||
git -C /lbry checkout ${VERSION}
|
git -C /lbry checkout ${VERSION}
|
||||||
WORKDIR /lbry
|
WORKDIR /lbry
|
||||||
RUN git clone https://github.com/lbryio/torba.git --depth 1 /lbry/torba
|
RUN git clone https://github.com/lbryio/torba.git --depth 1 /lbry/torba
|
||||||
|
|
|
@ -1,30 +1,27 @@
|
||||||
## This base image is for running the latest lbrynet-daemon release.
|
## This base image is for running the latest lbrynet-daemon release.
|
||||||
FROM ubuntu:18.04
|
FROM ubuntu:18.04 as prep
|
||||||
LABEL MAINTAINER="leopere [at] nixc [dot] us"
|
LABEL MAINTAINER="leopere [at] nixc [dot] us"
|
||||||
|
RUN apt-get update && apt-get -y install unzip curl
|
||||||
|
|
||||||
## Add lbrynet
|
## Add lbrynet
|
||||||
ADD https://lbry.io/get/lbrynet.linux.zip /lbrynet/lbrynet.linux.zip
|
ARG VERSION=latest
|
||||||
|
RUN URL=$(curl -s https://api.github.com/repos/lbryio/lbry/releases/$(if [ "${VERSION}" = 'latest' ]; then echo "latest"; else echo "tags/${VERSION}"; fi) | grep browser_download_url | grep lbrynet-linux.zip | cut -d'"' -f4) && echo $URL && curl -L -o /lbrynet.linux.zip $URL
|
||||||
|
|
||||||
RUN apt-get update && apt-get -y install unzip && \
|
COPY stuff/start.sh /usr/bin/start
|
||||||
adduser lbrynet --gecos GECOS --shell /bin/bash --disabled-password --home /home/lbrynet && \
|
COPY stuff/checkmount.sh /usr/bin/checkmount
|
||||||
unzip /lbrynet/lbrynet.linux.zip -d /lbrynet/ && \
|
RUN unzip /lbrynet.linux.zip -d /lbrynet/ && \
|
||||||
rm /lbrynet/lbrynet.linux.zip && \
|
mv /lbrynet/lbrynet /usr/bin && \
|
||||||
chown -Rv lbrynet:lbrynet /lbrynet && \
|
chmod a+x /usr/bin/checkmount /usr/bin/start /usr/bin/lbrynet
|
||||||
mv /lbrynet/lbrynet /bin/
|
|
||||||
|
|
||||||
COPY stuff/start.sh /usr/local/bin/start
|
|
||||||
COPY stuff/checkmount.sh /usr/local/bin/checkmount
|
|
||||||
|
|
||||||
|
FROM ubuntu:18.04 as app
|
||||||
|
COPY --from=prep /usr/bin/start /usr/bin/checkmount /usr/bin/lbrynet /usr/bin/
|
||||||
|
RUN adduser lbrynet --gecos GECOS --shell /bin/bash --disabled-password --home /home/lbrynet
|
||||||
## Daemon port [Intended for internal use]
|
## Daemon port [Intended for internal use]
|
||||||
## LBRYNET talks to peers on port 3333 [Intended for external use] this port is used to discover other lbrynet daemons with blobs.
|
## LBRYNET talks to peers on port 3333 [Intended for external use] this port is used to discover other lbrynet daemons with blobs.
|
||||||
## Expose 5566 Reflector port to listen on
|
## Expose 5566 Reflector port to listen on
|
||||||
## Expose 5279 Port the daemon API will listen on
|
## Expose 5279 Port the daemon API will listen on
|
||||||
## the lbryumx aka Wallet port [Intended for internal use]
|
## the lbryumx aka Wallet port [Intended for internal use]
|
||||||
EXPOSE 4444 3333 5566 5279 50001
|
EXPOSE 4444 3333 5566 5279 50001
|
||||||
|
|
||||||
## Example daemon_settings.yml is at https://github.com/lbryio/lbry/blob/master/example_daemon_settings.yml
|
|
||||||
ADD https://raw.githubusercontent.com/lbryio/lbry/master/example_daemon_settings.yml /etc/lbrynet/example_daemon_settings.yml
|
|
||||||
EXPOSE 5279
|
|
||||||
USER lbrynet
|
USER lbrynet
|
||||||
ENTRYPOINT ["/usr/local/bin/checkmount"]
|
ENTRYPOINT ["/usr/bin/checkmount"]
|
||||||
CMD ["start"]
|
CMD ["start"]
|
||||||
|
|
|
@ -8,5 +8,5 @@ if ! grep -qs ".* $mountpoint " /proc/mounts; then
|
||||||
## TODO: We should have documentation that this error references directly with a URL as to why it won't run without a volume.
|
## TODO: We should have documentation that this error references directly with a URL as to why it won't run without a volume.
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
`$@`
|
bash -c "$*"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,2 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
lbrynet start
|
CONFIG_PATH=/etc/lbry/daemon_settings.yml
|
||||||
|
|
||||||
|
echo "Config: "
|
||||||
|
cat $CONFIG_PATH
|
||||||
|
|
||||||
|
lbrynet start --api 0.0.0.0:5279 --config $CONFIG_PATH
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue