Skip to content

Commit 2f7b1b7

Browse files
aarranzaarranz
authored
Merge pull request #49 from aarranz/feature/use-named-volumes
Use named volumes to work around some docker problems on Windows
2 parents 9ec3f0f + 12de895 commit 2f7b1b7

18 files changed

Lines changed: 141 additions & 111 deletions

‎1.2/docker-compose-config-file.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -20,14 +20,14 @@ services:
2020
environment:
2121
- POSTGRES_PASSWORD=wirepass # Change this password!
2222
volumes:
23-
- ./postgres-data:/var/lib/postgresql/data
23+
- postgres-data:/var/lib/postgresql/data
2424

2525

2626
elasticsearch:
2727
restart: always
2828
image: elasticsearch:2.4
2929
volumes:
30-
- ./elasticsearch-data:/usr/share/elasticsearch/data
30+
- elasticsearch-data:/usr/share/elasticsearch/data
3131
command: elasticsearch -Des.index.max_result_window=50000
3232

3333

@@ -57,6 +57,12 @@ services:
5757
#- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
5858
#- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
5959
volumes:
60-
- ./wirecloud-data:/opt/wirecloud_instance/data
61-
- ./wirecloud-static:/var/www/static
60+
- wirecloud-data:/opt/wirecloud_instance/data
61+
- wirecloud-static:/var/www/static
6262
- ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro
63+
64+
volumes:
65+
elasticsearch-data:
66+
postgres-data:
67+
wirecloud-data:
68+
wirecloud-static:

‎1.2/docker-compose-idm.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -20,14 +20,14 @@ services:
2020
environment:
2121
- POSTGRES_PASSWORD=wirepass # Change this password!
2222
volumes:
23-
- ./postgres-data:/var/lib/postgresql/data
23+
- postgres-data:/var/lib/postgresql/data
2424

2525

2626
elasticsearch:
2727
restart: always
2828
image: elasticsearch:2.4
2929
volumes:
30-
- ./elasticsearch-data:/usr/share/elasticsearch/data
30+
- elasticsearch-data:/usr/share/elasticsearch/data
3131
command: elasticsearch -Des.index.max_result_window=50000
3232

3333

@@ -73,5 +73,11 @@ services:
7373
- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
7474
- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
7575
volumes:
76-
- ./wirecloud-data:/opt/wirecloud_instance/data
77-
- ./wirecloud-static:/var/www/static
76+
- wirecloud-data:/opt/wirecloud_instance/data
77+
- wirecloud-static:/var/www/static
78+
79+
volumes:
80+
elasticsearch-data:
81+
postgres-data:
82+
wirecloud-data:
83+
wirecloud-static:

‎1.2/docker-compose-simple.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -21,5 +21,9 @@ services:
2121
- DEBUG=False
2222
- FORWARDED_ALLOW_IPS=*
2323
volumes:
24-
- ./wirecloud-data:/opt/wirecloud_instance/data
25-
- ./wirecloud-static:/var/www/static
24+
- wirecloud-data:/opt/wirecloud_instance/data
25+
- wirecloud-static:/var/www/static
26+
27+
volumes:
28+
wirecloud-data:
29+
wirecloud-static:

‎1.2/docker-compose-standalone.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ services:
1010
environment:
1111
- DEBUG=True
1212
volumes:
13-
- ./wirecloud-data:/opt/wirecloud_instance/data
14-
- ./wirecloud-static:/var/www/static
13+
- wirecloud-data:/opt/wirecloud_instance/data
14+
- wirecloud-static:/var/www/static
15+
16+
volumes:
17+
wirecloud-data:
18+
wirecloud-static:

‎1.2/docker-compose.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -20,14 +20,14 @@ services:
2020
environment:
2121
- POSTGRES_PASSWORD=wirepass # Change this password!
2222
volumes:
23-
- ./postgres-data:/var/lib/postgresql/data
23+
- postgres-data:/var/lib/postgresql/data
2424

2525

2626
elasticsearch:
2727
restart: always
2828
image: elasticsearch:2.4
2929
volumes:
30-
- ./elasticsearch-data:/usr/share/elasticsearch/data
30+
- elasticsearch-data:/usr/share/elasticsearch/data
3131
command: elasticsearch -Des.index.max_result_window=50000
3232

3333

@@ -58,5 +58,11 @@ services:
5858
#- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
5959
#- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
6060
volumes:
61-
- ./wirecloud-data:/opt/wirecloud_instance/data
62-
- ./wirecloud-static:/var/www/static
61+
- wirecloud-data:/opt/wirecloud_instance/data
62+
- wirecloud-static:/var/www/static
63+
64+
volumes:
65+
elasticsearch-data:
66+
postgres-data:
67+
wirecloud-data:
68+
wirecloud-static:

‎1.2/tests.py‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4-
# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L.
4+
# Copyright (c) 2018-2020 Future Internet Consulting and Development Solutions S.L.
55

66
import grp
77
import pwd
@@ -89,8 +89,6 @@ def tearDownClass(cls):
8989
print("# Removing containers and volumes")
9090
print("#\n")
9191
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
92-
shutil.rmtree('wirecloud-data')
93-
shutil.rmtree('wirecloud-static')
9492
print()
9593

9694

@@ -113,8 +111,6 @@ def tearDownClass(cls):
113111
print("# Removing containers and volumes")
114112
print("#\n")
115113
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
116-
shutil.rmtree('wirecloud-data')
117-
shutil.rmtree('wirecloud-static')
118114
print()
119115

120116

@@ -137,10 +133,6 @@ def tearDownClass(cls):
137133
print("# Removing containers and volumes")
138134
print("#\n")
139135
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
140-
shutil.rmtree('wirecloud-data')
141-
shutil.rmtree('wirecloud-static')
142-
shutil.rmtree('elasticsearch-data')
143-
shutil.rmtree('postgres-data')
144136
print()
145137

146138

@@ -164,10 +156,6 @@ def tearDownClass(cls):
164156
print("# Removing containers and volumes")
165157
print("#\n")
166158
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
167-
shutil.rmtree('wirecloud-data')
168-
shutil.rmtree('wirecloud-static')
169-
shutil.rmtree('elasticsearch-data')
170-
shutil.rmtree('postgres-data')
171159
print()
172160

173161

@@ -196,10 +184,6 @@ def tearDownClass(cls):
196184
print("# Removing containers and volumes")
197185
print("#\n")
198186
sh.docker_compose.down(remove_orphans=True, v=True, _fg=True)
199-
shutil.rmtree('wirecloud-data')
200-
shutil.rmtree('wirecloud-static')
201-
shutil.rmtree('elasticsearch-data')
202-
shutil.rmtree('postgres-data')
203187
print()
204188

205189
def test_login_should_redirect_to_idm(self):

‎1.3/docker-compose-config-file.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -20,14 +20,14 @@ services:
2020
environment:
2121
- POSTGRES_PASSWORD=wirepass # Change this password!
2222
volumes:
23-
- ./postgres-data:/var/lib/postgresql/data
23+
- postgres-data:/var/lib/postgresql/data
2424

2525

2626
elasticsearch:
2727
restart: always
2828
image: elasticsearch:2.4
2929
volumes:
30-
- ./elasticsearch-data:/usr/share/elasticsearch/data
30+
- elasticsearch-data:/usr/share/elasticsearch/data
3131
command: elasticsearch -Des.index.max_result_window=50000
3232

3333

@@ -57,6 +57,12 @@ services:
5757
#- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
5858
#- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
5959
volumes:
60-
- ./wirecloud-data:/opt/wirecloud_instance/data
61-
- ./wirecloud-static:/var/www/static
60+
- wirecloud-data:/opt/wirecloud_instance/data
61+
- wirecloud-static:/var/www/static
6262
- ./settings.py:/opt/wirecloud_instance/wirecloud_instance/settings.py:ro
63+
64+
volumes:
65+
elasticsearch-data:
66+
postgres-data:
67+
wirecloud-data:
68+
wirecloud-static:

‎1.3/docker-compose-idm.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -20,14 +20,14 @@ services:
2020
environment:
2121
- POSTGRES_PASSWORD=wirepass # Change this password!
2222
volumes:
23-
- ./postgres-data:/var/lib/postgresql/data
23+
- postgres-data:/var/lib/postgresql/data
2424

2525

2626
elasticsearch:
2727
restart: always
2828
image: elasticsearch:2.4
2929
volumes:
30-
- ./elasticsearch-data:/usr/share/elasticsearch/data
30+
- elasticsearch-data:/usr/share/elasticsearch/data
3131
command: elasticsearch -Des.index.max_result_window=50000
3232

3333

@@ -73,5 +73,11 @@ services:
7373
- SOCIAL_AUTH_FIWARE_KEY=${SOCIAL_AUTH_FIWARE_KEY}
7474
- SOCIAL_AUTH_FIWARE_SECRET=${SOCIAL_AUTH_FIWARE_SECRET}
7575
volumes:
76-
- ./wirecloud-data:/opt/wirecloud_instance/data
77-
- ./wirecloud-static:/var/www/static
76+
- wirecloud-data:/opt/wirecloud_instance/data
77+
- wirecloud-static:/var/www/static
78+
79+
volumes:
80+
elasticsearch-data:
81+
postgres-data:
82+
wirecloud-data:
83+
wirecloud-static:

‎1.3/docker-compose-simple.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
- 80:80
1010
volumes:
1111
- ./nginx.conf:/etc/nginx/nginx.conf:ro
12-
- ./wirecloud-static:/var/www/static:ro
12+
- wirecloud-static:/var/www/static:ro
1313
depends_on:
1414
- wirecloud
1515

@@ -21,5 +21,9 @@ services:
2121
- DEBUG=False
2222
- FORWARDED_ALLOW_IPS=*
2323
volumes:
24-
- ./wirecloud-data:/opt/wirecloud_instance/data
25-
- ./wirecloud-static:/var/www/static
24+
- wirecloud-data:/opt/wirecloud_instance/data
25+
- wirecloud-static:/var/www/static
26+
27+
volumes:
28+
wirecloud-data:
29+
wirecloud-static:

‎1.3/docker-compose-standalone.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ services:
1010
environment:
1111
- DEBUG=True
1212
volumes:
13-
- ./wirecloud-data:/opt/wirecloud_instance/data
14-
- ./wirecloud-static:/var/www/static
13+
- wirecloud-data:/opt/wirecloud_instance/data
14+
- wirecloud-static:/var/www/static
15+
16+
volumes:
17+
wirecloud-data:
18+
wirecloud-static:

0 commit comments

Comments
 (0)