mrrl-containers

commit 563d6f30a61067ff1ea8933f6d786985d46bea7f
parent dc88d1525867c66f7e3a80bd6489accb21d3d7f6
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Mon, 27 Jun 2022 23:46:09 +0200

Add void-mpd container service, refactor service creation
Diffstat:
M
zsh-functions/confz_site_containers_init
 | 
37
+++++++++++++++++++++++++------------

1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -19,7 +19,7 @@ confz_site_containers_usersvc_simple_check() {
 }
 confz_site_containers_user_check() {
 	checkvars containers_dir svscan_dir user
-	local display container bind bind_dir bindroot uid gid
+	local display container bind bind_dir bindroot chome uid gid
 	local -a fstab
 	bind=$'\tnone\tbind,nosuid,nodev\t0 0'
 	uid="${${(s.:.)"$(getent passwd $vars[user])"}[3]}" \
@@ -42,34 +42,47 @@ confz_site_containers_user_check() {
 			image_name=$container
 	done
 
+	# void-recombee-browser
 	require site_containers_usersvc_simple \
 		:containers_dir :svscan_dir :user uid=$uid gid=$gid \
 		image_name=void-browsers container_name=void-recombee-browser
 
-	bindroot=$vars[containers_dir]/user/$vars[user]/alpine-sndio/root
+	container=alpine-sndio
+	bindroot=$vars[containers_dir]/user/$vars[user]/$container/root
 	require container_service_alsa \
-		image_name=alpine-sndio \
+		image_name=$container \
 		:containers_dir :svscan_dir :user
 
-	# bind-mounts for alpine-dev
-	bindroot=$vars[containers_dir]/user/$vars[user]/alpine-dev/root
+	container=void-mpd
+	bindroot=$vars[containers_dir]/user/$vars[user]/$container/root
+	require container_service_generic \
+		image_name=$container
+		:containers_dir :svscan_dir :user \
+		mnt_dirs_extra=audio \
+		fstab_extra=/mnt/volumes/audio$'\t'$bindroot/mnt/audio$'\tnone\tbind,ro,nosuid,nodev\t0 0'
+
+	container=alpine-dev
+	bindroot=$vars[containers_dir]/user/$vars[user]/$container/root
 	fstab=( )
+	# bind-mounts for alpine-dev
 	for bind_dir in /home/$vars[user]/{bzr,development,git}; do
 		fstab+=( $bind_dir$'\t'$bindroot/${bind_dir#/}$bind )
 	done
 	require container_service_generic \
-		image_name=alpine-dev fstab_extra=${(F)fstab} \
+		image_name=$container fstab_extra=${(F)fstab} \
 		:containers_dir :svscan_dir :user
 
+	container=alpine-recombee
+	chome=$vars[containers_dir]/user/$vars[user]/$container/home
+	bindroot=$vars[containers_dir]/user/$vars[user]/$container/root
 	# bind-mounts for alpine-recombee
-	bindroot=$vars[containers_dir]/user/$vars[user]/alpine-recombee/root
-	require fs_d filename=$vars[containers_dir]/user/$vars[user]/alpine-recombee/home/$vars[user]/git
-	require fs_o filename=$vars[containers_dir]/user/$vars[user]/alpine-recombee/home/$vars[user]/git owner=$uid:$gid
-	require fs_d filename=$vars[containers_dir]/user/$vars[user]/alpine-recombee/home/$vars[user]/git/recombee
-	require fs_o filename=$vars[containers_dir]/user/$vars[user]/alpine-recombee/home/$vars[user]/git/recombee owner=$uid:$gid
+	require fs_d filename=$chome/$vars[user]/git
+	require fs_o filename=$chome/$vars[user]/git owner=$uid:$gid
+	require fs_d filename=$chome/$vars[user]/git/recombee
+	require fs_o filename=$chome/$vars[user]/git/recombee owner=$uid:$gid
 	fstab=( /home/$vars[user]/git/recombee$'\t'$bindroot/home/$vars[user]/git/recombee$bind )
 	require container_service_generic \
-		image_name=alpine-recombee fstab_extra=${(F)fstab} \
+		image_name=$container fstab_extra=${(F)fstab} \
 		:containers_dir :svscan_dir :user
 }