Introduce a simple volume init helper container to create and instant…

…iate all

the necessary volumes and force it to complete before launching any of the
actual service containers so that they are guaranteed to have the required
state/X subdirs available for bind mount.
Sync configurable SMTP port to development_gdp setup.

docker-compose_development.yml

@@ -27,6 +27,43 @@ services:
       TZ: ${TZ}
       NETWORK: ${DOCKER_NETWORK:-docker-migrid_default}
 
+  # NOTE: we use a shared volume init helper container to make sure volumes
+  #       are fully created and instantiated before we try to bind mount
+  #       subdirs from e.g. the state volume in the service containers.
+  migrid-volume-init:
+    container_name: migrid-volume-init
+    image: ucphhpc/migrid${CONTAINER_TAG}
+    extends:
+      file: docker-compose_shared.yml
+      service: migrid-shared
+    environment:
+      TZ: ${TZ}
+      # RUN_SERVICES specifies which daemons to launch
+      # Available target service names follow migrid init script and are:
+      #   httpd script monitor sshmux events cron transfers
+      #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
+      RUN_SERVICES: 
+    volumes:
+      - type: volume
+        source: httpd
+        target: /etc/httpd
+      - type: volume
+        source: mig
+        target: /home/mig/mig
+      - type: volume
+        source: certs
+        target: /etc/httpd/MiG-certificates
+      - type: volume
+        source: migrid-syslog
+        target: /var/log
+      - type: volume
+        source: state
+        target: /home/mig/state
+    env_file:
+      - migrid-httpd.env
+    # NOTE: public hosts should create users through sign up and run like this
+    command: /app/docker-entry.sh -V
+
   # The migrid core services including httpd and tightly integrated services
   # like job handling (grid script, monitor, sshmux, imnoty and vmproxy)
 
@@ -53,7 +90,11 @@ services:
       #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
       RUN_SERVICES: httpd script monitor sshmux events cron transfers imnotify vmproxy notify crond rsyslogd
     depends_on:
-      - devdns
+      devdns:
+        condition: service_started
+      # IMPORTANT: finish volume init before migrid launch as explained above
+      migrid-volume-init:
+        condition: service_completed_successfully
     networks:
       default:
         aliases:

docker-compose_development_gdp.yml

@@ -8,7 +8,7 @@ services:
     depends_on:
       - devdns
     ports:
-      - "127.0.0.1:25:25"
+      - "127.0.0.1:${SMTP_LISTEN_PORT}:25"
     environment:
       POSTFIX_myhostname: ${SMTP_SERVER}
     networks:
@@ -27,6 +27,43 @@ services:
       TZ: ${TZ}
       NETWORK: ${DOCKER_NETWORK:-docker-migrid_default}
 
+  # NOTE: we use a shared volume init helper container to make sure volumes
+  #       are fully created and instantiated before we try to bind mount
+  #       subdirs from e.g. the state volume in the service containers.
+  migrid-volume-init:
+    container_name: migrid-volume-init
+    image: ucphhpc/migrid${CONTAINER_TAG}
+    extends:
+      file: docker-compose_shared.yml
+      service: migrid-shared
+    environment:
+      TZ: ${TZ}
+      # RUN_SERVICES specifies which daemons to launch
+      # Available target service names follow migrid init script and are:
+      #   httpd script monitor sshmux events cron transfers
+      #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
+      RUN_SERVICES: 
+    volumes:
+      - type: volume
+        source: httpd
+        target: /etc/httpd
+      - type: volume
+        source: mig
+        target: /home/mig/mig
+      - type: volume
+        source: certs
+        target: /etc/httpd/MiG-certificates
+      - type: volume
+        source: migrid-syslog
+        target: /var/log
+      - type: volume
+        source: state
+        target: /home/mig/state
+    env_file:
+      - migrid-httpd.env
+    # NOTE: public hosts should create users through sign up and run like this
+    command: /app/docker-entry.sh -V
+
   # The migrid core services including httpd and tightly integrated services
   # like job handling (grid script, monitor, sshmux, imnoty and vmproxy)
 
@@ -53,7 +90,11 @@ services:
       #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
       RUN_SERVICES: httpd script monitor sshmux events cron transfers imnotify vmproxy notify crond rsyslogd
     depends_on:
-      - devdns
+      devdns:
+        condition: service_started
+      # IMPORTANT: finish volume init before migrid launch as explained above
+      migrid-volume-init:
+        condition: service_completed_successfully
     networks:
       default:
         aliases:

docker-compose_production_bind.yml

@@ -13,6 +13,43 @@ services:
 #    environment:
 #      TZ: ${TZ}
 
+  # NOTE: we use a shared volume init helper container to make sure volumes
+  #       are fully created and instantiated before we try to bind mount
+  #       subdirs from e.g. the state volume in the service containers.
+  migrid-volume-init:
+    container_name: migrid-volume-init
+    image: ucphhpc/migrid${CONTAINER_TAG}
+    extends:
+      file: docker-compose_shared.yml
+      service: migrid-shared
+    environment:
+      TZ: ${TZ}
+      # RUN_SERVICES specifies which daemons to launch
+      # Available target service names follow migrid init script and are:
+      #   httpd script monitor sshmux events cron transfers
+      #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
+      RUN_SERVICES: 
+    volumes:
+      - type: volume
+        source: httpd
+        target: /etc/httpd
+      - type: volume
+        source: mig
+        target: /home/mig/mig
+      - type: volume
+        source: certs
+        target: /etc/httpd/MiG-certificates
+      - type: volume
+        source: migrid-syslog
+        target: /var/log
+      - type: volume
+        source: state
+        target: /home/mig/state
+    env_file:
+      - migrid-httpd.env
+    # NOTE: public hosts should create users through sign up and run like this
+    command: /app/docker-entry.sh -V
+
   # The migrid core services including httpd and tightly integrated services
   # like job handling (grid script, monitor, sshmux, imnoty and vmproxy)
 
@@ -39,6 +76,10 @@ services:
       #   httpd script monitor sshmux events cron transfers
       #   openid sftp sftpsubsys webdavs ftps notify imnotify vmproxy
       RUN_SERVICES: httpd script monitor sshmux events cron transfers imnotify vmproxy notify crond rsyslogd
+    depends_on:
+      # IMPORTANT: finish volume init before migrid launch as explained above
+      migrid-volume-init:
+        condition: service_completed_successfully
     volumes:
       - type: volume
         source: httpd

docker-entry.sh

@@ -170,7 +170,11 @@ for svc in ${RUN_SERVICES}; do
 done
 
 # Keep monitoring any active services 
-KEEP_RUNNING=1
+if [ -z "${CHK_SERVICES}" ]; then
+    KEEP_RUNNING=0
+else
+    KEEP_RUNNING=1
+fi
 EXIT_CODE=0
 # Check launched services
 while [ ${KEEP_RUNNING} -eq 1 ]; do