Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion docker-compose_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -111,6 +114,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -176,6 +182,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -227,6 +236,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -286,6 +298,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -340,6 +355,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -428,6 +446,14 @@ volumes:
device: ${DOCKER_MIGRID_ROOT}/mig
o: bind

mig-server-extconfs:
# Volume used to contain the optional additional mig server config snippets
driver: local
driver_opts:
type: none
device: ${PERSISTENT_ROOT}/mig-server-extconfs
o: bind

state:
# Volume used to contain the migrid state (provided by migrid)
driver: local
Expand All @@ -436,7 +462,7 @@ volumes:
device: ${DOCKER_MIGRID_ROOT}/state
o: bind

# NOTE: we don't bother setting up persistent data outside state here
# NOTE: we don't bother setting up other persistent data outside state here

log:
# Volume used to contain the mig state log folder shared by all containers
Expand Down
28 changes: 27 additions & 1 deletion docker-compose_development_gdp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -111,6 +114,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -180,6 +186,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -231,6 +240,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -290,6 +302,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -344,6 +359,9 @@ services:
- type: volume
source: mig
target: /home/mig/mig
- type: volume
source: mig-server-extconfs
target: /home/mig/mig/server/MiGserver.d
- type: volume
source: certs
target: /etc/httpd/MiG-certificates
Expand Down Expand Up @@ -432,6 +450,14 @@ volumes:
device: ${DOCKER_MIGRID_ROOT}/mig
o: bind

mig-server-extconfs:
# Volume used to contain the optional additional mig server config snippets
driver: local
driver_opts:
type: none
device: ${PERSISTENT_ROOT}/mig-server-extconfs
o: bind

state:
# Volume used to contain the migrid state (provided by migrid)
driver: local
Expand All @@ -440,7 +466,7 @@ volumes:
device: ${DOCKER_MIGRID_ROOT}/state
o: bind

# NOTE: we don't bother setting up persistent data outside state here
# NOTE: we don't bother setting up other persistent data outside state here

log:
# Volume used to contain the mig state log folder shared by all containers
Expand Down
Loading