diff options
| -rwxr-xr-x | genenetwork-development-deploy.sh | 5 | ||||
| -rw-r--r-- | genenetwork-development.scm | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/genenetwork-development-deploy.sh b/genenetwork-development-deploy.sh index b7f469d..2dc9135 100755 --- a/genenetwork-development-deploy.sh +++ b/genenetwork-development-deploy.sh @@ -21,6 +21,9 @@ # Build and install genenetwork development container on penguin2. +# If we shared only the mysqld.sock socket file, it would break when +# the external mysqld server is restarted. So, we share the mysqld +# socket directory. container_script=$(guix system container --network \ --verbosity=3 \ --load-path=. \ @@ -32,7 +35,7 @@ container_script=$(guix system container --network \ --expose=/export/data/genenetwork \ --share=/export/data/genenetwork-xapian \ --share=/export/genenetwork-database-dump \ - --share=/var/run/mysqld/mysqld.sock=/run/mysqld/mysqld.sock \ + --share=/var/run/mysqld=/run/mysqld \ genenetwork-development.scm) echo $container_script diff --git a/genenetwork-development.scm b/genenetwork-development.scm index 638d2c9..688d02f 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -436,11 +436,14 @@ described by CONFIG, a <genenetwork-configuration> object." (program-file "genenetwork2" (genenetwork2-cd-gexp config)) #:name "genenetwork2-pola-wrapper" + ;; If we mapped only the mysqld.sock + ;; socket file, it would break when the + ;; external mysqld server is restarted. #:mappings (list (file-system-mapping (source genotype-files) (target source)) (file-system-mapping - (source "/run/mysqld/mysqld.sock") + (source "/run/mysqld") (target source) (writable? #t))) #:namespaces (delq 'net %namespaces)) @@ -458,8 +461,11 @@ described by CONFIG, a <genenetwork-configuration> object." (program-file "genenetwork3" (genenetwork3-cd-gexp config)) #:name "genenetwork3-pola-wrapper" + ;; If we mapped only the mysqld.sock + ;; socket file, it would break when the + ;; external mysqld server is restarted. #:mappings (list (file-system-mapping - (source "/run/mysqld/mysqld.sock") + (source "/run/mysqld") (target source) (writable? #t)) (file-system-mapping |