Add exec flag to lbrynet binary

Add support regtest

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:latest
 EXPOSE 5279 5280
 
 VOLUME /storage
@@ -11,5 +11,6 @@ COPY conf/test_daemon_settings.yml ./
 COPY conf/regtest_daemon_settings.yml ./
 
 COPY launcher.sh ./launcher.sh
-RUN chmod a+x launcher.sh
+COPY scripts/probe.sh ./probe.sh
+RUN chmod +x lbrynet ./*.sh
 CMD ["./launcher.sh"]

Makefile

@@ -1,18 +1,9 @@
-all:
-	make clean
-	make latest_image
-	make publish
-	make clean
+image:
+	scripts/build.sh ${VERSION}
 
-latest_image:
-	scripts/get_release.sh
-
-latest_rc_image:
-	scripts/get_release.sh rc
-
-.PHONY: publish
-publish:
-	scripts/publish.sh
+.PHONY: push
+push:
+	scripts/push.sh ${VERSION}
 
 clean:
 	rm -rf lbrynet lbrynet-linux.zip

README.md

@@ -32,17 +32,15 @@ You need to have the docker toolset installed on your system, as well as the abi
 This is the preferred method because it also checks if our newly built container can actually run.
 
 ```
-make latest_image
-# or
-make latest_rc_image
-make publish VERSION=0.36.0
+export VERSION=0.101.1
+make image
+make publish
 ```
 
 #### Manually
 
 ```
-make get_release
-docker build -t lbry/lbrynet-tv:0.36.0 .
-docker tag lbry/lbrynet-tv:0.36.0 lbry/lbrynet-tv:latest
-docker push lbry/lbrynet-tv
+make image
+docker build -t lbry/lbrynet-tv:0.101.1
+docker push lbry/lbrynet-tv:0.101.1
 ```

conf/daemon_settings.yml

@@ -11,13 +11,10 @@ data_dir: /storage/lbrynet
 download_dir: /storage/download
 wallet_dir: /storage/lbryum
 
-
-
 save_blobs: false
 save_files: false
 share_usage_data: false
 use_upnp: false
 save_resolved_claims: false
 
-lbryum_servers:
-- spv26.lbry.com:50001
+reflect_streams: false

launcher.sh

@@ -46,4 +46,5 @@ if [ ! -z ${SDK_LBRYUM_SERVERS+x} ]; then
     SDK_ARGS="${SDK_ARGS} --lbryum-servers=${SDK_LBRYUM_SERVERS}"
 fi
 
+rm -rf /storage/lbrynet/lbrynet.sqlite*
 ./lbrynet start --config=$CONFIG $SDK_ARGS

scripts/build.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+BASE_IMAGE_NAME=lbry/lbrynet-tv
+WAIT=5
+
+if [ -z ${1} ]; then
+    echo "Please provide lbrynet version as an argument."
+    exit 1
+fi
+
+VERSION=$1
+RELEASE_URL="https://github.com/lbryio/lbry-sdk/releases/download/v$VERSION/lbrynet-linux.zip"
+
+echo "Getting the version ${VERSION} from ${RELEASE_URL}..."
+curl -OL $RELEASE_URL
+unzip lbrynet-linux.zip
+rm lbrynet-linux.zip
+
+docker build -t ${BASE_IMAGE_NAME}:${VERSION} --platform linux/amd64 .
+
+echo "Launching container for ${BASE_IMAGE_NAME}:${VERSION} and giving it ${WAIT}s to launch..."
+
+ID=$(docker run --detach --rm $BASE_IMAGE_NAME:$VERSION)
+sleep $WAIT
+
+if [[ -z "${ID+x}" || ! $(docker top "$ID") ]]; then
+    echo "Container crashed unexpectedly, aborting"
+    exit 1
+fi
+
+echo "Container launched successfully, stopping it"
+docker kill $ID

scripts/get_release.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BASE_IMAGE_NAME=lbry/lbrynet-tv
-
-if [[ ${1} == "rc" ]]; then
-    API_URL="https://api.github.com/repos/lbryio/lbry/releases"
-    RC_SUFFIX="-rc"
-elif [ ${1} != ""  ]; then
-    API_URL="https://api.github.com/repos/lbryio/lbry/releases/tags/${1}"
-    RC_SUFFIX=""
-else
-    API_URL="https://api.github.com/repos/lbryio/lbry/releases/latest"
-    RC_SUFFIX=""
-fi
-
-echo "URL: ${API_URL}"
-
-URL=$(
-    curl -siL ${API_URL}|
-    grep browser_download_url|
-    grep linux|
-    head -n 1|
-    sed -E 's/.*"([^"]+)".*/\1/'
-)
-
-VERSION=$(echo $URL|sed -e 's/.*download\/v\([^"]*\)\/.*/\1/')
-
-echo "Getting the latest version ${VERSION} from ${URL}..."
-curl -OL $URL
-unzip lbrynet-linux.zip
-rm lbrynet-linux.zip
-
-docker build -t ${BASE_IMAGE_NAME}:${VERSION} -t ${BASE_IMAGE_NAME}:latest${RC_SUFFIX} .

scripts/probe.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+curl -sd '{"method": "status"}' $1 |grep '"wallet": true'

scripts/publish.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-WAIT=5
-BASE_IMAGE_NAME=lbry/lbrynet-tv
-
-if [ -z ${VERSION+x} ]; then
-    echo "Please provide ${BASE_IMAGE_NAME} version as \$VERSION variable."
-    exit 1
-fi
-
-echo "Launching daemon container for ${BASE_IMAGE_NAME}:${VERSION} and giving it ${WAIT} secs..."
-
-ID=$(docker run --detach --rm $BASE_IMAGE_NAME:$VERSION)
-sleep $WAIT
-
-if [[ -z "${ID+x}" || ! $(docker top "$ID") ]]; then
-    echo "Container crashed unexpectedly, aborting"
-    exit 1
-fi
-
-echo "Container launched successfully, stopping it"
-docker kill $ID
-
-echo "Pushing to Docker Hub..."
-docker push ${BASE_IMAGE_NAME}:${VERSION}
-docker push ${BASE_IMAGE_NAME}:latest

scripts/push.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+BASE_IMAGE_NAME=lbry/lbrynet-tv
+
+if [ -z ${1} ]; then
+    echo "Please provide ${BASE_IMAGE_NAME} version as an argument."
+    exit 1
+fi
+
+VERSION=$1
+echo "Pushing to Docker Hub..."
+docker push ${BASE_IMAGE_NAME}:${VERSION}