Merge pull request #10 from chamunks/master

Merging in latest work on lbry-docker baseline
This commit is contained in:
Mark 2018-10-06 12:59:47 -04:00 committed by GitHub
commit 00a27ab7fc
4 changed files with 29 additions and 7 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
/data

View file

@ -8,7 +8,7 @@ lbrycrdurl="rpc://lbryrpc:changeme@10.10.0.3:9245"
mysqldsn="changeme:changeme@tcp(10.10.0.10:3306)/chainquery"
#API MySQL DSN is required for chainquery to expose a SQL query service
apimysqldsn="changeme:changeme@tcp(0.0.0.0:3306)/chainquery"
apimysqldsn="changeme:changeme@tcp(10.10.0.10:3306)/chainquery"
#The command that should be executed to trigger a self update of the software. For linux, for example, `<yourscript>.sh`
#DEFAULT-autoupdatecommand=[unset]

View file

@ -5,12 +5,13 @@ networks:
external: true
services:
#############
## MariaDB ##
#############
###########
## MYSQL ##
###########
## MariaDB is currently not supported and neither is later versions of MySQL this may change.
## https://hub.docker.com/r/_/mariadb/
mysql:
image: mysql
image: mysql.5.7.23
restart: always
networks:
lbrynet:

View file

@ -1,4 +1,10 @@
#!/bin/bash
## ToDo:
## Get a test case to see if this is the first run or a repeat run
## If it's a first run you need to do a full index including all transactions
## tx index creates an index of every single transaction in the block history if
## not specified it will only create an index for transactions that are related to the wallet or have unspent outputs.
## This is specific to chainquery.
## Ensure perms are correct prior to running main binary
chown -R 1000:1000 /data
@ -8,6 +14,21 @@ chmod -R 755 /etc/lbrycrdd
rm -f /var/run/lbrycrdd.pid
## For now keeping this simple. Potentially eventually add all command args as envvars for the Dockerfile or use safe way to add args via docker-compose.yml
## Command to initialize
# lbrycrdd \
# -conf=${CONF_PATH:-/etc/lbrycrdd/lbrycrdd.conf} \
# -data=${DATA_DIR:-/data/} \
# -port=${PORT:-9246} \
# -pid=${PID_FILE:/var/run/lbrycrdd.pid} \
# -printtoconsole \
# -rpcport=${RPC_PORT:-9245} \
# -rpcpassword=${RPC_PASSWORD:-changeme} \
# -rpcuser=${RPC_USER:-lbryrpc} \
# -rpcallowip=${RPC_ALLOW_IP:-10.10.0.2} \
# -reindex \
# -txindex
## Command to run for long term.
lbrycrdd \
-conf=${CONF_PATH:-/etc/lbrycrdd/lbrycrdd.conf} \
-data=${DATA_DIR:-/data/} \
@ -17,4 +38,5 @@ lbrycrdd \
-rpcport=${RPC_PORT:-9245} \
-rpcpassword=${RPC_PASSWORD:-changeme} \
-rpcuser=${RPC_USER:-lbryrpc} \
-rpcallowip=${RPC_ALLOW_IP:-10.10.0.2}
-rpcallowip=${RPC_ALLOW_IP:-10.10.0.2} \
-txindex