Skip to content

Commit 03738c5

Browse files
committed
Addressed a copule of issues raised in latest PR review. Namely fix naming for mrsl_files (not copy/pasted mrsl_home) and add missing sharelink_home volume declaration.
Added checkconf self-test to migrid container in development docker compose.
1 parent 0a1e91d commit 03738c5

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

docker-compose_development.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ services:
140140
env_file:
141141
- migrid-httpd.env
142142
# IMPORTANT: please ONLY run with this test@ user for non-public hosts
143-
command: /app/docker-entry.sh -V -u ${MIG_TEST_USER} -p ${MIG_TEST_USER_PASSWORD} -s "sftp ftps webdavs"
143+
command: /app/docker-entry.sh -V -c -u ${MIG_TEST_USER} -p ${MIG_TEST_USER_PASSWORD} -s "sftp ftps webdavs"
144144
# NOTE: public hosts should create users through sign up and run like this
145145
#command: /app/docker-entry.sh -V
146146

docker-compose_development_gdp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
env_file:
6464
- migrid-httpd.env
6565
# NOTE: public hosts should create users through sign up and run like this
66-
command: /app/docker-entry.sh -V
66+
command: /app/docker-entry.sh -V -c
6767

6868
# The migrid core services including httpd and tightly integrated services
6969
# like job handling (grid script, monitor, sshmux, imnoty and vmproxy)

docker-compose_production_bind.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ services:
119119
source: freeze_home
120120
target: /home/mig/state/freeze_home
121121
- type: volume
122-
source: mrsl_home
123-
target: /home/mig/state/mrsl_home
122+
source: mrsl_files
123+
target: /home/mig/state/mrsl_files
124124
- type: volume
125125
source: resource_home
126126
target: /home/mig/state/resource_home
@@ -242,8 +242,8 @@ services:
242242
# source: freeze_home
243243
# target: /home/mig/state/freeze_home
244244
#- type: volume
245-
# source: mrsl_home
246-
# target: /home/mig/state/mrsl_home
245+
# source: mrsl_files
246+
# target: /home/mig/state/mrsl_files
247247
#- type: volume
248248
# source: resource_home
249249
# target: /home/mig/state/resource_home
@@ -364,8 +364,8 @@ services:
364364
# source: freeze_home
365365
# target: /home/mig/state/freeze_home
366366
#- type: volume
367-
# source: mrsl_home
368-
# target: /home/mig/state/mrsl_home
367+
# source: mrsl_files
368+
# target: /home/mig/state/mrsl_files
369369
#- type: volume
370370
# source: resource_home
371371
# target: /home/mig/state/resource_home
@@ -486,8 +486,8 @@ services:
486486
# source: freeze_home
487487
# target: /home/mig/state/freeze_home
488488
#- type: volume
489-
# source: mrsl_home
490-
# target: /home/mig/state/mrsl_home
489+
# source: mrsl_files
490+
# target: /home/mig/state/mrsl_files
491491
#- type: volume
492492
# source: resource_home
493493
# target: /home/mig/state/resource_home
@@ -608,8 +608,8 @@ services:
608608
# source: freeze_home
609609
# target: /home/mig/state/freeze_home
610610
#- type: volume
611-
# source: mrsl_home
612-
# target: /home/mig/state/mrsl_home
611+
# source: mrsl_files
612+
# target: /home/mig/state/mrsl_files
613613
#- type: volume
614614
# source: resource_home
615615
# target: /home/mig/state/resource_home
@@ -796,12 +796,12 @@ volumes:
796796
device: ${PERSISTENT_ROOT}/freeze_home
797797
o: bind
798798

799-
mrsl_home:
800-
# Volume used to contain the migrid mrsl_home
799+
mrsl_files:
800+
# Volume used to contain the migrid mrsl_files
801801
driver: local
802802
driver_opts:
803803
type: none
804-
device: ${PERSISTENT_ROOT}/mrsl_home
804+
device: ${PERSISTENT_ROOT}/mrsl_files
805805
o: bind
806806

807807
resource_home:
@@ -820,6 +820,14 @@ volumes:
820820
device: ${PERSISTENT_ROOT}/re_home
821821
o: bind
822822

823+
sharelink_home:
824+
# Volume used to contain the migrid sharelink_home
825+
driver: local
826+
driver_opts:
827+
type: none
828+
device: ${PERSISTENT_ROOT}/sharelink_home
829+
o: bind
830+
823831
events_home:
824832
# Volume used to contain the migrid events_home
825833
driver: local

0 commit comments

Comments
 (0)