Add chainquery to youtube sync repo to be used for e2e testing of support transfer
Remove timeout for wait-for-it calls
This commit is contained in:
parent
4548c41082
commit
e98061f2eb
4 changed files with 13 additions and 7 deletions
|
@ -3,7 +3,7 @@
|
||||||
FROM ubuntu:18.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 && \
|
RUN apt-get update && \
|
||||||
apt-get -y install unzip curl && \
|
apt-get -y install unzip curl telnet wait-for-it && \
|
||||||
apt-get autoclean -y && \
|
apt-get autoclean -y && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
|
@ -16,6 +16,10 @@ RUN curl -s -o /chainquery http://build.lbry.io/chainquery/branch-"${VERSION}"/c
|
||||||
|
|
||||||
|
|
||||||
FROM ubuntu:18.04 as app
|
FROM ubuntu:18.04 as app
|
||||||
|
RUN apt-get update && \
|
||||||
|
apt-get -y install telnet wait-for-it && \
|
||||||
|
apt-get autoclean -y && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
ARG VERSION="master"
|
ARG VERSION="master"
|
||||||
ADD https://raw.githubusercontent.com/lbryio/chainquery/"${VERSION}"/config/default/chainqueryconfig.toml /etc/lbry/chainqueryconfig.toml.orig
|
ADD https://raw.githubusercontent.com/lbryio/chainquery/"${VERSION}"/config/default/chainqueryconfig.toml /etc/lbry/chainqueryconfig.toml.orig
|
||||||
RUN adduser chainquery --gecos GECOS --shell /bin/bash --disabled-password --home /home/chainquery && \
|
RUN adduser chainquery --gecos GECOS --shell /bin/bash --disabled-password --home /home/chainquery && \
|
||||||
|
|
|
@ -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 --build-arg VERSION=$1 --tag lbry/chainquery:$1 .
|
docker build --no-cache --build-arg VERSION=$1 --tag lbry/chainquery:$1 .
|
||||||
docker push lbry/chainquery:$1
|
docker push lbry/chainquery:$1
|
|
@ -18,7 +18,7 @@ mysqldsn="lbry:lbry@tcp(mysqlCQ:3306)/chainquery"
|
||||||
#API MySQL DSN is required for chainquery to expose a SQL query service
|
#API MySQL DSN is required for chainquery to expose a SQL query service
|
||||||
#DEFAULT: "lbry:lbry@tcp(localhost:3306)/chainquery"
|
#DEFAULT: "lbry:lbry@tcp(localhost:3306)/chainquery"
|
||||||
#SUGGESTED: "lbry:lbry@unix(/var/run/mysqld/mysqld.sock)/chainquery"
|
#SUGGESTED: "lbry:lbry@unix(/var/run/mysqld/mysqld.sock)/chainquery"
|
||||||
#apimysqldsn=
|
apimysqldsn="lbry:lbry@tcp(mysqlCQ:3306)/chainquery"
|
||||||
|
|
||||||
#API Host and Port is required for the API Server to bind and listen on.
|
#API Host and Port is required for the API Server to bind and listen on.
|
||||||
#DEFAULT: "0.0.0.0:6300"
|
#DEFAULT: "0.0.0.0:6300"
|
||||||
|
|
|
@ -100,7 +100,7 @@ services:
|
||||||
- MYSQL_USER=lbry
|
- MYSQL_USER=lbry
|
||||||
- MYSQL_PASS=lbry
|
- MYSQL_PASS=lbry
|
||||||
- MYSQL_DATABASE=lbry
|
- MYSQL_DATABASE=lbry
|
||||||
entrypoint: wait-for-it mysql:3306 -- wait-for-it lbrynet:5279 -- ./latest serve
|
entrypoint: wait-for-it -t 0 mysql:3306 -- wait-for-it -t 0 lbrynet:5279 -- ./latest serve
|
||||||
######################
|
######################
|
||||||
## MySQL Chainquery ##
|
## MySQL Chainquery ##
|
||||||
######################
|
######################
|
||||||
|
@ -123,12 +123,14 @@ services:
|
||||||
## Chainquery ##
|
## Chainquery ##
|
||||||
################
|
################
|
||||||
chainquery:
|
chainquery:
|
||||||
image: lbry/chainquery:v1.8.1
|
image: lbry/chainquery:master
|
||||||
restart: "no"
|
restart: "no"
|
||||||
ports:
|
ports:
|
||||||
- 6300:6300
|
- 6300:6300
|
||||||
depends_on:
|
depends_on:
|
||||||
- mysql
|
- lbrycrd
|
||||||
|
- mysqlCQ
|
||||||
## TODO: Uncomment this in a docker-compose.override.yml to allow for external configurations.
|
## TODO: Uncomment this in a docker-compose.override.yml to allow for external configurations.
|
||||||
volumes:
|
volumes:
|
||||||
- ./chainqueryconfig.toml:/etc/lbry/chainqueryconfig.toml
|
- ./chainqueryconfig.toml:/etc/lbry/chainqueryconfig.toml
|
||||||
|
entrypoint: wait-for-it -t 0 lbrycrd:29245 -- wait-for-it -t 0 mysqlCQ:3306 -- start
|
Loading…
Reference in a new issue