From d968a5bbb969a3032f4460afcb294e4672dc5aa6 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Thu, 9 Feb 2023 09:12:28 +0000
Subject: Share the mysqld socket directory into the container.

We ought to share the mysqld socket directory into the container, not
the socket itself. If we only shared the socket, when the mysql server
is restarted and a new socket is created, the bind mounting into the
container would break and the container would need to be restarted.

* genenetwork-development-deploy.sh: Share /var/run/mysqld, not
/var/run/mysqld/mysqld.sock.
* genenetwork-development.scm (genenetwork-shepherd-services): Share
/run/mysqld, not /run/mysqld/mysqld.sock.
---
 genenetwork-development-deploy.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'genenetwork-development-deploy.sh')

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
-- 
cgit v1.2.3