Skip to content

Commit e3b3b43

Browse files
committed
An alternative integration of the mig server config extension snippets like
PR105 but using a bind mounted volume in PERSISTENT_ROOT for the config snippets instead as agreed in the PR105 discussion. This will enable easy adjustment of e.g. the CLOUD_X sections where user access and such may need more frequent updates than what is feasible to handle with rebuild/redeploy every time.
1 parent 36f6c1d commit e3b3b43

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ initdirs: initcomposevars
129129
mkdir -p ${PERSISTENT_ROOT}/wwwpublic-vgrid
130130
mkdir -p ${PERSISTENT_ROOT}/wwwpublic-download
131131
mkdir -p ${PERSISTENT_ROOT}/secrets
132+
mkdir -p ${PERSISTENT_ROOT}/mig-server-extconfs
132133
mkdir -p ${LOG_ROOT}/miglog
133134
mkdir -p ${LOG_ROOT}/syslog/migrid
134135
mkdir -p ${LOG_ROOT}/syslog/migrid-io

docker-compose_production.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ services:
4141
- type: volume
4242
source: mig
4343
target: /home/mig/mig
44+
- type: volume
45+
source: mig-server-extconfs
46+
target: /home/mig/mig/server/MiGserver.d
4447
- type: volume
4548
source: certs
4649
target: /etc/httpd/MiG-certificates
@@ -92,6 +95,9 @@ services:
9295
- type: volume
9396
source: mig
9497
target: /home/mig/mig
98+
- type: volume
99+
source: mig-server-extconfs
100+
target: /home/mig/mig/server/MiGserver.d
95101
- type: volume
96102
source: certs
97103
target: /etc/httpd/MiG-certificates
@@ -227,6 +233,9 @@ services:
227233
- type: volume
228234
source: mig
229235
target: /home/mig/mig
236+
- type: volume
237+
source: mig-server-extconfs
238+
target: /home/mig/mig/server/MiGserver.d
230239
- type: volume
231240
source: certs
232241
target: /etc/httpd/MiG-certificates
@@ -356,6 +365,9 @@ services:
356365
- type: volume
357366
source: mig
358367
target: /home/mig/mig
368+
- type: volume
369+
source: mig-server-extconfs
370+
target: /home/mig/mig/server/MiGserver.d
359371
- type: volume
360372
source: certs
361373
target: /etc/httpd/MiG-certificates
@@ -484,6 +496,9 @@ services:
484496
- type: volume
485497
source: mig
486498
target: /home/mig/mig
499+
- type: volume
500+
source: mig-server-extconfs
501+
target: /home/mig/mig/server/MiGserver.d
487502
- type: volume
488503
source: certs
489504
target: /etc/httpd/MiG-certificates
@@ -612,6 +627,9 @@ services:
612627
- type: volume
613628
source: mig
614629
target: /home/mig/mig
630+
- type: volume
631+
source: mig-server-extconfs
632+
target: /home/mig/mig/server/MiGserver.d
615633
- type: volume
616634
source: certs
617635
target: /etc/httpd/MiG-certificates
@@ -740,6 +758,9 @@ services:
740758
- type: volume
741759
source: mig
742760
target: /home/mig/mig
761+
- type: volume
762+
source: mig-server-extconfs
763+
target: /home/mig/mig/server/MiGserver.d
743764
- type: volume
744765
source: migrid-lustre-quota-syslog
745766
target: /var/log
@@ -813,6 +834,14 @@ volumes:
813834
device: ${DOCKER_MIGRID_ROOT}/mig
814835
o: bind
815836

837+
mig-server-extconf:
838+
# Volume used to contain the optional additional mig server config snippets
839+
driver: local
840+
driver_opts:
841+
type: none
842+
device: ${PERSISTENT_ROOT}/mig-server-extconfs
843+
o: bind
844+
816845
state:
817846
# Volume used to contain the migrid state (provided by migrid)
818847
driver: local

0 commit comments

Comments
 (0)