From 12de895e9ec0447d74ccf63d3e0ca48c56e20a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Arranz?= Date: Thu, 16 Jan 2020 18:22:52 +0100 Subject: [PATCH] Use named volumes to work around some docker problems on Windows --- 1.2/docker-compose-config-file.yml | 16 +++++++++++----- 1.2/docker-compose-idm.yml | 16 +++++++++++----- 1.2/docker-compose-simple.yml | 10 +++++++--- 1.2/docker-compose-standalone.yml | 8 ++++++-- 1.2/docker-compose.yml | 16 +++++++++++----- 1.2/tests.py | 18 +----------------- 1.3/docker-compose-config-file.yml | 16 +++++++++++----- 1.3/docker-compose-idm.yml | 16 +++++++++++----- 1.3/docker-compose-simple.yml | 10 +++++++--- 1.3/docker-compose-standalone.yml | 8 ++++++-- 1.3/docker-compose.yml | 16 +++++++++++----- 1.3/tests.py | 18 +----------------- dev/docker-compose-config-file.yml | 16 +++++++++++----- dev/docker-compose-idm.yml | 16 +++++++++++----- dev/docker-compose-simple.yml | 10 +++++++--- dev/docker-compose-standalone.yml | 8 ++++++-- dev/docker-compose.yml | 16 +++++++++++----- dev/tests.py | 18 +----------------- 18 files changed, 141 insertions(+), 111 deletions(-) diff --git a/1.2/docker-compose-config-file.yml b/1.2/docker-compose-config-file.yml index e5d145b..b95af91 100644 --- a/1.2/docker-compose-config-file.yml +++ b/1.2/docker-compose-config-file.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -57,6 +57,12 @@ services: #- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} #- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static - ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.2/docker-compose-idm.yml b/1.2/docker-compose-idm.yml index c13b7a5..426afdf 100644 --- a/1.2/docker-compose-idm.yml +++ b/1.2/docker-compose-idm.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -73,5 +73,11 @@ services: - SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} - SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.2/docker-compose-simple.yml b/1.2/docker-compose-simple.yml index 9f23b83..e24ca65 100644 --- a/1.2/docker-compose-simple.yml +++ b/1.2/docker-compose-simple.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -21,5 +21,9 @@ services: - DEBUG=False - FORWARDED_ALLOW_IPS=* volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/1.2/docker-compose-standalone.yml b/1.2/docker-compose-standalone.yml index 08484fd..507a328 100644 --- a/1.2/docker-compose-standalone.yml +++ b/1.2/docker-compose-standalone.yml @@ -10,5 +10,9 @@ services: environment: - DEBUG=True volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/1.2/docker-compose.yml b/1.2/docker-compose.yml index 33965bb..cba349b 100644 --- a/1.2/docker-compose.yml +++ b/1.2/docker-compose.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -58,5 +58,11 @@ services: #- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} #- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.2/tests.py b/1.2/tests.py index e342473..e408053 100644 --- a/1.2/tests.py +++ b/1.2/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L. +# Copyright (c) 2018-2020 Future Internet Consulting and Development Solutions S.L. import grp import pwd @@ -89,8 +89,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -113,8 +111,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -137,10 +133,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -164,10 +156,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -196,10 +184,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() def test_login_should_redirect_to_idm(self): diff --git a/1.3/docker-compose-config-file.yml b/1.3/docker-compose-config-file.yml index 4278bcf..90c887c 100644 --- a/1.3/docker-compose-config-file.yml +++ b/1.3/docker-compose-config-file.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -57,6 +57,12 @@ services: #- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} #- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static - ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.3/docker-compose-idm.yml b/1.3/docker-compose-idm.yml index f586990..ff22bc3 100644 --- a/1.3/docker-compose-idm.yml +++ b/1.3/docker-compose-idm.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -73,5 +73,11 @@ services: - SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} - SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.3/docker-compose-simple.yml b/1.3/docker-compose-simple.yml index e35f4b3..80cacad 100644 --- a/1.3/docker-compose-simple.yml +++ b/1.3/docker-compose-simple.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -21,5 +21,9 @@ services: - DEBUG=False - FORWARDED_ALLOW_IPS=* volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/1.3/docker-compose-standalone.yml b/1.3/docker-compose-standalone.yml index f442f2e..9ca05a2 100644 --- a/1.3/docker-compose-standalone.yml +++ b/1.3/docker-compose-standalone.yml @@ -10,5 +10,9 @@ services: environment: - DEBUG=True volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/1.3/docker-compose.yml b/1.3/docker-compose.yml index 3cefacd..860c8ff 100644 --- a/1.3/docker-compose.yml +++ b/1.3/docker-compose.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -65,5 +65,11 @@ services: #- SOCIAL_AUTH_KEYCLOAK_KEY=${SOCIAL_AUTH_KEYCLOAK_KEY} #- SOCIAL_AUTH_KEYCLOAK_SECRET=${SOCIAL_AUTH_KEYCLOAK_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/1.3/tests.py b/1.3/tests.py index e342473..e408053 100644 --- a/1.3/tests.py +++ b/1.3/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L. +# Copyright (c) 2018-2020 Future Internet Consulting and Development Solutions S.L. import grp import pwd @@ -89,8 +89,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -113,8 +111,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -137,10 +133,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -164,10 +156,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -196,10 +184,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() def test_login_should_redirect_to_idm(self): diff --git a/dev/docker-compose-config-file.yml b/dev/docker-compose-config-file.yml index c3334c0..b59ba44 100644 --- a/dev/docker-compose-config-file.yml +++ b/dev/docker-compose-config-file.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -57,6 +57,12 @@ services: #- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} #- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static - ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/dev/docker-compose-idm.yml b/dev/docker-compose-idm.yml index 58e099a..f7d6499 100644 --- a/dev/docker-compose-idm.yml +++ b/dev/docker-compose-idm.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -73,5 +73,11 @@ services: - SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY} - SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/dev/docker-compose-simple.yml b/dev/docker-compose-simple.yml index e6b4d54..4703389 100644 --- a/dev/docker-compose-simple.yml +++ b/dev/docker-compose-simple.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -21,5 +21,9 @@ services: - DEBUG=False - FORWARDED_ALLOW_IPS=* volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/dev/docker-compose-standalone.yml b/dev/docker-compose-standalone.yml index f4a702c..82c8104 100644 --- a/dev/docker-compose-standalone.yml +++ b/dev/docker-compose-standalone.yml @@ -10,5 +10,9 @@ services: environment: - DEBUG=True volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + wirecloud-data: + wirecloud-static: diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 74dede8..32dfe15 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -9,7 +9,7 @@ services: - 80:80 volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./wirecloud-static:/var/www/static:ro + - wirecloud-static:/var/www/static:ro depends_on: - wirecloud @@ -20,14 +20,14 @@ services: environment: - POSTGRES_PASSWORD=wirepass # Change this password! volumes: - - ./postgres-data:/var/lib/postgresql/data + - postgres-data:/var/lib/postgresql/data elasticsearch: restart: always image: elasticsearch:2.4 volumes: - - ./elasticsearch-data:/usr/share/elasticsearch/data + - elasticsearch-data:/usr/share/elasticsearch/data command: elasticsearch -Des.index.max_result_window=50000 @@ -65,5 +65,11 @@ services: #- SOCIAL_AUTH_KEYCLOAK_KEY=${SOCIAL_AUTH_KEYCLOAK_KEY} #- SOCIAL_AUTH_KEYCLOAK_SECRET=${SOCIAL_AUTH_KEYCLOAK_SECRET} volumes: - - ./wirecloud-data:/opt/wirecloud_instance/data - - ./wirecloud-static:/var/www/static + - wirecloud-data:/opt/wirecloud_instance/data + - wirecloud-static:/var/www/static + +volumes: + elasticsearch-data: + postgres-data: + wirecloud-data: + wirecloud-static: diff --git a/dev/tests.py b/dev/tests.py index e342473..e408053 100644 --- a/dev/tests.py +++ b/dev/tests.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L. +# Copyright (c) 2018-2020 Future Internet Consulting and Development Solutions S.L. import grp import pwd @@ -89,8 +89,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -113,8 +111,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') print() @@ -137,10 +133,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -164,10 +156,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() @@ -196,10 +184,6 @@ def tearDownClass(cls): print("# Removing containers and volumes") print("#\n") sh.docker_compose.down(remove_orphans=True, v=True, _fg=True) - shutil.rmtree('wirecloud-data') - shutil.rmtree('wirecloud-static') - shutil.rmtree('elasticsearch-data') - shutil.rmtree('postgres-data') print() def test_login_should_redirect_to_idm(self):