From cbbac1f1a63aeb4d62c7e69c0b53c5ad75657d56 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Wed, 9 Sep 2020 23:27:43 +1000 Subject: [PATCH 1/3] #253: Add a warning for IPAM mismatches in docker network. Signed-off-by: Karl Hepworth --- service/library/up.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/service/library/up.go b/service/library/up.go index 3ed6de8a..c6f2cd49 100644 --- a/service/library/up.go +++ b/service/library/up.go @@ -98,6 +98,11 @@ func Up(c Config) { } else { fmt.Printf("Could not create network %v\n", Network.Name) } + } else { + n, _ := docker.DockerNetworkGet(Network.Name) + if fmt.Sprint(n.IPAM.Config) != fmt.Sprint(c.Networks[Network.Name].IPAM.Config) { + fmt.Printf("Warning: IP Address ranges for %v don't match configuration\n", Network.Name) + } } } } From fa15e46f3ae85c7d5ea5225e22f0b03e34f50a8c Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Wed, 9 Sep 2020 23:34:33 +1000 Subject: [PATCH 2/3] #253: Add a quick test for IPAM configuration warnings. Signed-off-by: Karl Hepworth --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index db941030..71d10856 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,6 +79,13 @@ matrix: docker inspect amazeeio-mailhog | jq '.[].Config.Labels["pygmy.abracadabra"]' | grep "1"; docker inspect amazeeio-mailhog | jq '.[].Config.Labels["pygmy.opensesame"]' | grep "correct"; + # Test for IPAM misconfiguration warnings. + - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml clean; + - docker network create amazeeio-network + - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml up | grep 'Warning: IP Address ranges for amazeeio-network' + - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml clean; + - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml up; + # Drupal 8 (Drupal Example): - git clone https://github.com/amazeeio/drupal-example.git drupal8-lagoon && cd drupal8-lagoon - docker-compose -p drupal8-example up -d From fa6b13cda9e81fbfc29540407bab960a79ba131c Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Wed, 9 Sep 2020 23:38:50 +1000 Subject: [PATCH 3/3] Adjustment to grep for IPAM warning checks Signed-off-by: Karl Hepworth --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71d10856..f13cdb2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ matrix: # Test for IPAM misconfiguration warnings. - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml clean; - docker network create amazeeio-network - - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml up | grep 'Warning: IP Address ranges for amazeeio-network' + - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml up | grep 'IP Address ranges for amazeeio-network' - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml clean; - ./pygmy-go-linux-x86 --config examples/pygmy.travis.yml up;