From 7d1aad982269601ae2c3660c9f9bd42e9b2dd88a Mon Sep 17 00:00:00 2001 From: Elisabeth Kulzer Date: Tue, 9 Jun 2020 09:56:47 +0200 Subject: [PATCH] Revert "Docker compose network (#14771)" (#14782) This reverts commit 91f1c47ba300eb315b9041938df98ee671ef7f25. master is broken because of this. Skip tests. --- build/docker-compose.yml | 8 -------- docker-compose.yaml | 5 ----- 2 files changed, 13 deletions(-) diff --git a/build/docker-compose.yml b/build/docker-compose.yml index f19ded346f..5e589e0fcb 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -45,11 +45,3 @@ services: networks: mm-test: driver: bridge - ipam: - driver: default - config: - - subnet: 192.168.254.0/24 - ip_range: 192.168.254.0/24 - gateway: 192.168.254.1 - - diff --git a/docker-compose.yaml b/docker-compose.yaml index 204ef98224..3f47f9d830 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -70,8 +70,3 @@ services: networks: mm-test: driver: bridge - ipam: - driver: default - config: - - subnet: 192.168.254.0/24 - ip_range: 192.168.254.0/24