Add build argument for docker build.sh file

Update compose to use v0.38.6 of lbrynet
This commit is contained in:
Mark Beamer Jr 2019-08-13 23:03:37 -04:00
parent adeabc97f8
commit 1b1d7f5ec0
No known key found for this signature in database
GPG key ID: 1C314FB89AD76973
4 changed files with 6 additions and 6 deletions

View file

@ -47,7 +47,7 @@ services:
## Lbrynet ## ## Lbrynet ##
############# #############
lbrynet: lbrynet:
image: lbry/lbrynet:v0.38.5 image: lbry/lbrynet:v0.38.6
restart: always restart: always
ports: ports:
- "15100:5279" - "15100:5279"

View file

@ -8,7 +8,7 @@ services:
## Lbrynet ## ## Lbrynet ##
############# #############
lbrynet: lbrynet:
image: lbry/lbrynet:v0.38.5 image: lbry/lbrynet:v0.38.6
restart: "no" restart: "no"
networks: networks:
lbry-network: lbry-network:

View file

@ -1,10 +1,10 @@
## This base image is for running the latest lbrynet-daemon release. ## This base image is for running the latest lbrynet-daemon release.
FROM ubuntu:16.04 as prep 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 telnet wait-for-it RUN apt-get update && apt-get -y install unzip curl telnet wait-for-it
## Add lbrynet ## Add lbrynet
ARG VERSION="v0.38.5" ARG VERSION="v0.38.6"
RUN URL=$(curl -s https://api.github.com/repos/lbryio/lbry-sdk/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 URL=$(curl -s https://api.github.com/repos/lbryio/lbry-sdk/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
COPY start.sh /usr/bin/start COPY start.sh /usr/bin/start
@ -13,7 +13,7 @@ RUN unzip /lbrynet.linux.zip -d /lbrynet/ && \
mv /lbrynet/lbrynet /usr/bin && \ mv /lbrynet/lbrynet /usr/bin && \
chmod a+x /usr/bin/checkmount /usr/bin/start /usr/bin/lbrynet chmod a+x /usr/bin/checkmount /usr/bin/start /usr/bin/lbrynet
FROM ubuntu:16.04 as app FROM ubuntu:18.04 as app
COPY --from=prep /usr/bin/start /usr/bin/checkmount /usr/bin/lbrynet /usr/bin/ 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 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]

View file

@ -4,5 +4,5 @@ if [ $# -eq 0 ]
echo "No docker tag argument supplied. Use './build.sh <tag>'" echo "No docker tag argument supplied. Use './build.sh <tag>'"
exit 1 exit 1
fi fi
docker build --tag lbry/lbrynet:$1 . docker build --build-arg VERSION=$1 --tag lbry/lbrynet:$1 .
docker push lbry/lbrynet:$1 docker push lbry/lbrynet:$1