From 5ecc8865a9b388f0cc964dfffc486b1329911101 Mon Sep 17 00:00:00 2001 From: Leopere Date: Thu, 29 Nov 2018 19:13:06 +0000 Subject: [PATCH 1/2] Changed network name to avoid string collision --- chainquery/README.md | 2 +- chainquery/docker-compose.yml | 6 +++--- lbrycrd/docker-compose.yml | 4 ++-- network-up.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chainquery/README.md b/chainquery/README.md index 3208471..98ff312 100644 --- a/chainquery/README.md +++ b/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 lbrynetwork` ## Make directories and set permissions diff --git a/chainquery/docker-compose.yml b/chainquery/docker-compose.yml index 786f7df..a3d8a8d 100644 --- a/chainquery/docker-compose.yml +++ b/chainquery/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' networks: - lbrynet: + lbrynetwork: external: true services: @@ -14,7 +14,7 @@ services: image: mysql:5.7.23 restart: always networks: - lbrynet: + lbrynetwork: ipv4_address: 10.6.1.10 aliases: - mysql @@ -39,7 +39,7 @@ services: target: app restart: always networks: - lbrynet: + lbrynetwork: ipv4_address: 10.6.1.3 env_file: - .env diff --git a/lbrycrd/docker-compose.yml b/lbrycrd/docker-compose.yml index ce3255a..30be417 100644 --- a/lbrycrd/docker-compose.yml +++ b/lbrycrd/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' networks: - lbrynet: + lbrynetwork: external: true services: @@ -12,7 +12,7 @@ services: build: . restart: always networks: - lbrynet: + lbrynetwork: ipv4_address: 10.6.1.2 labels: - "traefik.expose=false" diff --git a/network-up.sh b/network-up.sh index 3f62d9e..4595b1a 100644 --- a/network-up.sh +++ b/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 lbrynetwork From 3cc799d5fe10dfd65a3144c2e15194c3a43bdb41 Mon Sep 17 00:00:00 2001 From: Leopere Date: Thu, 29 Nov 2018 19:14:02 +0000 Subject: [PATCH 2/2] fixup --- chainquery/README.md | 2 +- chainquery/docker-compose.yml | 6 +++--- lbrycrd/docker-compose.yml | 4 ++-- network-up.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chainquery/README.md b/chainquery/README.md index 98ff312..f9fce36 100644 --- a/chainquery/README.md +++ b/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 lbrynetwork` +`docker network create -d bridge --subnet=10.6.1.0/16 lbry-network` ## Make directories and set permissions diff --git a/chainquery/docker-compose.yml b/chainquery/docker-compose.yml index a3d8a8d..83fbad3 100644 --- a/chainquery/docker-compose.yml +++ b/chainquery/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' networks: - lbrynetwork: + lbry-network: external: true services: @@ -14,7 +14,7 @@ services: image: mysql:5.7.23 restart: always networks: - lbrynetwork: + lbry-network: ipv4_address: 10.6.1.10 aliases: - mysql @@ -39,7 +39,7 @@ services: target: app restart: always networks: - lbrynetwork: + lbry-network: ipv4_address: 10.6.1.3 env_file: - .env diff --git a/lbrycrd/docker-compose.yml b/lbrycrd/docker-compose.yml index 30be417..a7601e5 100644 --- a/lbrycrd/docker-compose.yml +++ b/lbrycrd/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' networks: - lbrynetwork: + lbry-network: external: true services: @@ -12,7 +12,7 @@ services: build: . restart: always networks: - lbrynetwork: + lbry-network: ipv4_address: 10.6.1.2 labels: - "traefik.expose=false" diff --git a/network-up.sh b/network-up.sh index 4595b1a..032ee12 100644 --- a/network-up.sh +++ b/network-up.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -docker network create -d bridge --subnet=10.6.1.0/16 lbrynetwork +docker network create -d bridge --subnet=10.6.1.0/16 lbry-network