From b63b5fd26aec5e89b486de5a5ac5ddd50a0cf4c4 Mon Sep 17 00:00:00 2001 From: Leopere Date: Tue, 2 Oct 2018 17:22:47 -0400 Subject: [PATCH] This shouldn't collide in my testing env --- chainquery/.env | 2 +- chainquery/Dockerfile | 5 +++++ chainquery/docker-compose.yml | 23 +++++++++++++++++++++++ lbrycrd/.env | 2 +- lbrycrd/compile/Dockerfile | 0 lbrycrd/compile/README.md | 0 lbrycrd/compile/docker-compose.yml | 0 lbrycrd/docker-compose.yml | 2 +- lbrycrd/start.sh | 2 +- lbrynet-daemon/docker-compose.yml | 2 +- traefik/docker-compose.yml | 2 +- traefik/network-up.sh | 2 +- www.spee.ch/.env | 2 +- www.spee.ch/advanced-docker-compose.yml | 14 +++++++------- www.spee.ch/docker-compose.yml | 8 ++++---- 15 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 chainquery/Dockerfile create mode 100644 chainquery/docker-compose.yml create mode 100644 lbrycrd/compile/Dockerfile create mode 100644 lbrycrd/compile/README.md create mode 100644 lbrycrd/compile/docker-compose.yml diff --git a/chainquery/.env b/chainquery/.env index 75e65b4..f8ce0dc 100644 --- a/chainquery/.env +++ b/chainquery/.env @@ -2,4 +2,4 @@ COMPOSE_PROJECT_NAME=chainquery RPC_USER=${RPC_USER=lbryrpc} RPC_PASSWORD=${RPC_PASSWORD:-$(env LC_CTYPE=C LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 16 | xargs)} ## This should be the internal container IP from which you'll be calling the RPC for Lbrycrdd from. -RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.6.0.2} +RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.10.0.2} diff --git a/chainquery/Dockerfile b/chainquery/Dockerfile new file mode 100644 index 0000000..9defd80 --- /dev/null +++ b/chainquery/Dockerfile @@ -0,0 +1,5 @@ +## This base image is for running latest lbrycrdd +FROM ## +MAINTAINER chamunks [at] gmail [dot] com + +ADD https://raw.githubusercontent.com/lbryio/chainquery/master/config/default/chainqueryconfig.toml /etc/chainquery/chainqueryconfig.toml.default diff --git a/chainquery/docker-compose.yml b/chainquery/docker-compose.yml new file mode 100644 index 0000000..311b0ad --- /dev/null +++ b/chainquery/docker-compose.yml @@ -0,0 +1,23 @@ +version: '3.4' + +networks: + lbrynet + external: true + +services: +################ +## Chainquery ## +################ + chainquery: + build: . + restart: always + networks: + lbrynet + ipv4_address: 10.10.0.1 + labels: + - "traefik.expose=false" + expose: + - #### + ## host volumes for persistent data such as wallet private keys. + volumes: + - ./data/:/data diff --git a/lbrycrd/.env b/lbrycrd/.env index 6135184..1978a57 100644 --- a/lbrycrd/.env +++ b/lbrycrd/.env @@ -2,4 +2,4 @@ COMPOSE_PROJECT_NAME=lbrycrd RPC_USER=${RPC_USER=lbryrpc} RPC_PASSWORD=${RPC_PASSWORD:-$(env LC_CTYPE=C LC_ALL=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 16 | xargs)} ## This should be the internal container IP from which you'll be calling the RPC for Lbrycrdd from. -RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.6.0.2} +RPC_ALLOW_IP=${RPC_ALLOW_IP:-10.10.0.2} diff --git a/lbrycrd/compile/Dockerfile b/lbrycrd/compile/Dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/lbrycrd/compile/README.md b/lbrycrd/compile/README.md new file mode 100644 index 0000000..e69de29 diff --git a/lbrycrd/compile/docker-compose.yml b/lbrycrd/compile/docker-compose.yml new file mode 100644 index 0000000..e69de29 diff --git a/lbrycrd/docker-compose.yml b/lbrycrd/docker-compose.yml index 73c0e86..97ca7f6 100644 --- a/lbrycrd/docker-compose.yml +++ b/lbrycrd/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: always networks: lbrynet - ipv4_address: 10.6.0.1 + ipv4_address: 10.10.0.1 labels: - "traefik.expose=false" expose: diff --git a/lbrycrd/start.sh b/lbrycrd/start.sh index b3c3c99..8a4a928 100644 --- a/lbrycrd/start.sh +++ b/lbrycrd/start.sh @@ -15,5 +15,5 @@ rm -f /var/run/lbrycrdd.pid -printtoconsole \ -rpcport=${RPC_PORT:-9245} \ -rpcpassword=${RPC_PASSWORD:-changeme} \ - -rpcallowip=${RPC_ALLOW_IP:-10.6.0.2} \ + -rpcallowip=${RPC_ALLOW_IP:-10.10.0.2} \ -rpcuser=${RPC_USER:-lbryrpc} diff --git a/lbrynet-daemon/docker-compose.yml b/lbrynet-daemon/docker-compose.yml index 0100b82..25df42e 100644 --- a/lbrynet-daemon/docker-compose.yml +++ b/lbrynet-daemon/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: always networks: lbrynet - ipv4_address: 10.6.0.3 + ipv4_address: 10.10.0.3 labels: - "traefik.expose=false" ports: diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index 7d952ef..cdd294c 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -15,7 +15,7 @@ services: command: --api --docker --docker.domain=docker.localhost --logLevel=DEBUG networks: lbrynet - ipv4_address: 10.6.0.100 + ipv4_address: 10.10.0.100 ports: - target: 80 published: 80 diff --git a/traefik/network-up.sh b/traefik/network-up.sh index 1d0304e..1a5fe6f 100644 --- a/traefik/network-up.sh +++ b/traefik/network-up.sh @@ -1,2 +1,2 @@ #!/bin/bash -docker network create -d bridge --subnet=10.6.0.0/16 lbrynet +docker network create -d bridge --subnet=10.10.0.0/16 lbrynet diff --git a/www.spee.ch/.env b/www.spee.ch/.env index 057cf48..129b3bd 100644 --- a/www.spee.ch/.env +++ b/www.spee.ch/.env @@ -1,6 +1,6 @@ COMPOSE_PROJECT_NAME=speech ## This value can generally be left alone in a default setup. -MYSQL_SERVER=10.6.0.8 +MYSQL_SERVER=10.10.0.8 ## Update the rest of these if possible. MYSQL_USER=replaceme MYSQL_PASSWORD=REPLACEME diff --git a/www.spee.ch/advanced-docker-compose.yml b/www.spee.ch/advanced-docker-compose.yml index 371437d..5c0322e 100644 --- a/www.spee.ch/advanced-docker-compose.yml +++ b/www.spee.ch/advanced-docker-compose.yml @@ -23,7 +23,7 @@ services: - "traefik.port=3000" networks: green: - ipv4_address: 10.6.0.6 + ipv4_address: 10.10.0.6 aliases: - speech @@ -45,7 +45,7 @@ services: test: traefik.enable=false networks: green: - ipv4_address: 10.6.0.7 + ipv4_address: 10.10.0.7 aliases: - lbrynet @@ -57,7 +57,7 @@ services: image: mariadb # restart: always environment: - MYSQL_SERVER: 10.6.0.8 + MYSQL_SERVER: 10.10.0.8 MYSQL_USER: replaceme MYSQL_PASSWORD: REPLACEME MYSQL_DATABASE: speech @@ -70,7 +70,7 @@ services: test: traefik.enable=false networks: green: - ipv4_address: 10.6.0.8 + ipv4_address: 10.10.0.8 aliases: - mysql @@ -95,7 +95,7 @@ services: # test: ["CMD", "curl", "--fail", "http://localhost:8080/", "||", "exit", "1"] networks: green: - ipv4_address: 10.6.0.9 + ipv4_address: 10.10.0.9 aliases: - adminer @@ -139,7 +139,7 @@ services: retries: 3 networks: green: - ipv4_address: 10.6.0.10 + ipv4_address: 10.10.0.10 aliases: - traefik @@ -151,4 +151,4 @@ networks: driver: bridge ipam: config: - - subnet: 10.6.0.0/16 + - subnet: 10.10.0.0/16 diff --git a/www.spee.ch/docker-compose.yml b/www.spee.ch/docker-compose.yml index a8b6e52..7be904b 100644 --- a/www.spee.ch/docker-compose.yml +++ b/www.spee.ch/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./data/speech:/data networks: green: - ipv4_address: 10.6.0.6 + ipv4_address: 10.10.0.6 aliases: - speech @@ -47,7 +47,7 @@ services: - ./data/lbrynet:/data networks: green: - ipv4_address: 10.6.0.7 + ipv4_address: 10.10.0.7 aliases: - lbrynet @@ -74,7 +74,7 @@ services: - ./data/db:/var/lib/mysql networks: green: - ipv4_address: 10.6.0.8 + ipv4_address: 10.10.0.8 aliases: - mysql @@ -86,4 +86,4 @@ networks: driver: bridge ipam: config: - - subnet: 10.6.0.0/16 + - subnet: 10.10.0.0/16