Skip to content

Commit 7570141

Browse files
rasmunkrasmunk
committed
Add the missing mig-server-extconfs volume to the development docker-compose files to prepare the branch for merging
1 parent 4608f8d commit 7570141

File tree

2 files changed

+66
-14
lines changed

2 files changed

+66
-14
lines changed

‎docker-compose_development.yml‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# docker-compose version
2-
version: '3.7'
2+
version: "3.7"
33

44
services:
55
devmail:
@@ -21,7 +21,7 @@ services:
2121
image: ${CONTAINER_REGISTRY}/ruudud/devdns
2222
container_name: devdns
2323
ports:
24-
- "127.0.0.1:53:53/udp"
24+
- "127.0.0.1:53:53/udp"
2525
volumes:
2626
- /var/run/docker.sock:/var/run/docker.sock:ro
2727
environment:
@@ -43,7 +43,7 @@ services:
4343
# Available target service names follow migrid init script and are:
4444
# httpd script monitor sshmux events cron transfers janitor
4545
# openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
46-
RUN_SERVICES:
46+
RUN_SERVICES:
4747
volumes:
4848
- type: volume
4949
source: httpd
@@ -54,6 +54,9 @@ services:
5454
- type: volume
5555
source: hotfixes
5656
target: /hotfixes
57+
- type: volume
58+
source: mig-server-extconfs
59+
target: /home/mig/mig/server/MiGserver.d
5760
- type: volume
5861
source: certs
5962
target: /etc/httpd/MiG-certificates
@@ -117,6 +120,9 @@ services:
117120
- type: volume
118121
source: hotfixes
119122
target: /hotfixes
123+
- type: volume
124+
source: mig-server-extconfs
125+
target: /home/mig/mig/server/MiGserver.d
120126
- type: volume
121127
source: certs
122128
target: /etc/httpd/MiG-certificates
@@ -169,7 +175,7 @@ services:
169175
migrid-volume-init:
170176
condition: service_completed_successfully
171177
ports:
172-
# NOTE: expose the unique raw port(s) to host
178+
# NOTE: expose the unique raw port(s) to host
173179
- "${OPENID_PORT}:${OPENID_PORT}"
174180
networks:
175181
default:
@@ -185,6 +191,9 @@ services:
185191
- type: volume
186192
source: hotfixes
187193
target: /hotfixes
194+
- type: volume
195+
source: mig-server-extconfs
196+
target: /home/mig/mig/server/MiGserver.d
188197
- type: volume
189198
source: certs
190199
target: /etc/httpd/MiG-certificates
@@ -222,7 +231,7 @@ services:
222231
migrid-volume-init:
223232
condition: service_completed_successfully
224233
ports:
225-
# NOTE: expose the unique raw port(s) to host
234+
# NOTE: expose the unique raw port(s) to host
226235
- "${SFTP_PORT}:${SFTP_PORT}"
227236
- "${SFTP_SUBSYS_PORT}:${SFTP_SUBSYS_PORT}"
228237
networks:
@@ -239,6 +248,9 @@ services:
239248
- type: volume
240249
source: hotfixes
241250
target: /hotfixes
251+
- type: volume
252+
source: mig-server-extconfs
253+
target: /home/mig/mig/server/MiGserver.d
242254
- type: volume
243255
source: certs
244256
target: /etc/httpd/MiG-certificates
@@ -301,6 +313,9 @@ services:
301313
- type: volume
302314
source: hotfixes
303315
target: /hotfixes
316+
- type: volume
317+
source: mig-server-extconfs
318+
target: /home/mig/mig/server/MiGserver.d
304319
- type: volume
305320
source: certs
306321
target: /etc/httpd/MiG-certificates
@@ -342,7 +357,7 @@ services:
342357
migrid-volume-init:
343358
condition: service_completed_successfully
344359
ports:
345-
# NOTE: expose the unique raw port(s) to host
360+
# NOTE: expose the unique raw port(s) to host
346361
- "${DAVS_PORT}:${DAVS_PORT}"
347362
networks:
348363
default:
@@ -358,6 +373,9 @@ services:
358373
- type: volume
359374
source: hotfixes
360375
target: /hotfixes
376+
- type: volume
377+
source: mig-server-extconfs
378+
target: /home/mig/mig/server/MiGserver.d
361379
- type: volume
362380
source: certs
363381
target: /etc/httpd/MiG-certificates
@@ -397,7 +415,7 @@ services:
397415
migrid:
398416
condition: service_started
399417
ports:
400-
# NOTE: expose the unique raw port(s) to host
418+
# NOTE: expose the unique raw port(s) to host
401419
- "80:80"
402420
- "443:443"
403421
- "444:444"
@@ -454,6 +472,14 @@ volumes:
454472
device: ${PERSISTENT_ROOT}/hotfixes
455473
o: bind
456474

475+
mig-server-extconfs:
476+
# Volume used to contain the optional additional mig server config snippets
477+
driver: local
478+
driver_opts:
479+
type: none
480+
device: ${PERSISTENT_ROOT}/mig-server-extconfs
481+
o: bind
482+
457483
state:
458484
# Volume used to contain the migrid state (provided by migrid)
459485
driver: local

‎docker-compose_development_gdp.yml‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# docker-compose version
2-
version: '3.7'
2+
version: "3.7"
33

44
services:
55
devmail:
@@ -21,7 +21,7 @@ services:
2121
image: ${CONTAINER_REGISTRY}/ruudud/devdns
2222
container_name: devdns
2323
ports:
24-
- "127.0.0.1:53:53/udp"
24+
- "127.0.0.1:53:53/udp"
2525
volumes:
2626
- /var/run/docker.sock:/var/run/docker.sock:ro
2727
environment:
@@ -43,7 +43,7 @@ services:
4343
# Available target service names follow migrid init script and are:
4444
# httpd script monitor sshmux events cron transfers janitor
4545
# openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
46-
RUN_SERVICES:
46+
RUN_SERVICES:
4747
volumes:
4848
- type: volume
4949
source: httpd
@@ -54,6 +54,9 @@ services:
5454
- type: volume
5555
source: hotfixes
5656
target: /hotfixes
57+
- type: volume
58+
source: mig-server-extconfs
59+
target: /home/mig/mig/server/MiGserver.d
5760
- type: volume
5861
source: certs
5962
target: /etc/httpd/MiG-certificates
@@ -117,6 +120,9 @@ services:
117120
- type: volume
118121
source: hotfixes
119122
target: /hotfixes
123+
- type: volume
124+
source: mig-server-extconfs
125+
target: /home/mig/mig/server/MiGserver.d
120126
- type: volume
121127
source: certs
122128
target: /etc/httpd/MiG-certificates
@@ -173,7 +179,7 @@ services:
173179
migrid-volume-init:
174180
condition: service_completed_successfully
175181
ports:
176-
# NOTE: expose the unique raw port(s) to host
182+
# NOTE: expose the unique raw port(s) to host
177183
- "${OPENID_PORT}:${OPENID_PORT}"
178184
networks:
179185
default:
@@ -189,6 +195,9 @@ services:
189195
- type: volume
190196
source: hotfixes
191197
target: /hotfixes
198+
- type: volume
199+
source: mig-server-extconfs
200+
target: /home/mig/mig/server/MiGserver.d
192201
- type: volume
193202
source: certs
194203
target: /etc/httpd/MiG-certificates
@@ -226,7 +235,7 @@ services:
226235
migrid-volume-init:
227236
condition: service_completed_successfully
228237
ports:
229-
# NOTE: expose the unique raw port(s) to host
238+
# NOTE: expose the unique raw port(s) to host
230239
- "${SFTP_PORT}:${SFTP_PORT}"
231240
- "${SFTP_SUBSYS_PORT}:${SFTP_SUBSYS_PORT}"
232241
networks:
@@ -243,6 +252,9 @@ services:
243252
- type: volume
244253
source: hotfixes
245254
target: /hotfixes
255+
- type: volume
256+
source: mig-server-extconfs
257+
target: /home/mig/mig/server/MiGserver.d
246258
- type: volume
247259
source: certs
248260
target: /etc/httpd/MiG-certificates
@@ -305,6 +317,9 @@ services:
305317
- type: volume
306318
source: hotfixes
307319
target: /hotfixes
320+
- type: volume
321+
source: mig-server-extconfs
322+
target: /home/mig/mig/server/MiGserver.d
308323
- type: volume
309324
source: certs
310325
target: /etc/httpd/MiG-certificates
@@ -346,7 +361,7 @@ services:
346361
migrid-volume-init:
347362
condition: service_completed_successfully
348363
ports:
349-
# NOTE: expose the unique raw port(s) to host
364+
# NOTE: expose the unique raw port(s) to host
350365
- "${DAVS_PORT}:${DAVS_PORT}"
351366
networks:
352367
default:
@@ -362,6 +377,9 @@ services:
362377
- type: volume
363378
source: hotfixes
364379
target: /hotfixes
380+
- type: volume
381+
source: mig-server-extconfs
382+
target: /home/mig/mig/server/MiGserver.d
365383
- type: volume
366384
source: certs
367385
target: /etc/httpd/MiG-certificates
@@ -401,7 +419,7 @@ services:
401419
migrid:
402420
condition: service_started
403421
ports:
404-
# NOTE: expose the unique raw port(s) to host
422+
# NOTE: expose the unique raw port(s) to host
405423
- "80:80"
406424
- "443:443"
407425
- "444:444"
@@ -458,6 +476,14 @@ volumes:
458476
device: ${PERSISTENT_ROOT}/hotfixes
459477
o: bind
460478

479+
mig-server-extconfs:
480+
# Volume used to contain the optional additional mig server config snippets
481+
driver: local
482+
driver_opts:
483+
type: none
484+
device: ${PERSISTENT_ROOT}/mig-server-extconfs
485+
o: bind
486+
461487
state:
462488
# Volume used to contain the migrid state (provided by migrid)
463489
driver: local

0 commit comments

Comments
 (0)