Merge branch 'master' into lbrynet

chainquery/README.md

@@ -46,7 +46,7 @@ You only need external networking if you plan on keeping your docker-compose fil
 For the sake of modularity in the design of this git repository the plan is to give you examples to try and then you're supposed to move towards your own custom docker-compose configuration.  We're going to create
 a docker bridge network that is going to be managed externally to your usual docker-compose networks which are compose internal.
 
-`docker network create -d bridge --subnet=10.6.1.0/16 lbrynet`
+`docker network create -d bridge --subnet=10.6.1.0/16 lbry-network`
 
 ## Make directories and set permissions
 

chainquery/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 
 networks:
-  lbrynet:
+  lbry-network:
     external: true
 
 services:
@@ -14,7 +14,7 @@ services:
     image: mysql:5.7.23
     restart: always
     networks:
-      lbrynet:
+      lbry-network:
         ipv4_address: 10.6.1.10
         aliases:
           - mysql
@@ -39,7 +39,7 @@ services:
       target: app
     restart: always
     networks:
-      lbrynet:
+      lbry-network:
         ipv4_address: 10.6.1.3
     env_file:
       - .env

lbrycrd/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 
 networks:
-  lbrynet:
+  lbry-network:
     external: true
 
 services:
@@ -12,7 +12,7 @@ services:
     build: .
     restart: always
     networks:
-      lbrynet:
+      lbry-network:
         ipv4_address: 10.6.1.2
     labels:
       - "traefik.expose=false"

network-up.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker network create -d bridge --subnet=10.6.1.0/16 lbrynet
+docker network create -d bridge --subnet=10.6.1.0/16 lbry-network