mrrl-containers

commit 3b2bd9cccbfe99aee0e70be05b3a8d93d13cacde
parent 96bae935b4d317059cddba0dfded47877d7744ae
Author: ccx <ccx@te2000.cz>
Date:   Tue, 11 Jun 2024 22:15:16 +0000

Add dotfiles and scripts mounts to containers by default

Diffstat:
M
zsh-functions/confz_site_containers_init
 | 
26
++++++++------------------

1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -3,6 +3,8 @@
 typeset -gA site_containers_mountpoints=(
 	init	/home/ccx/bzr/container-user-init
 	ccx-bzr	/home/ccx/bzr
+	ccx-dotfiles	/home/ccx/bzr/container-dotfiles
+	ccx-scripts	/home/ccx/bzr/container-scripts
 	ccx-password-store	/home/ccx/bzr/password-store
 	ccx-development	/home/ccx/development
 	ccx-baregit	/home/ccx/baregit
@@ -20,7 +22,7 @@ typeset -gA site_containers_mountpoints=(
 confz_site_containers_usersvc_simple_check() {
 	checkvars containers_dir svscan_dir user uid gid image_name
 	defvar container_name "$vars[image_name]"
-	defvar mount_ro init
+	defvar mount_ro "init ccx-dotfiles ccx-scripts"
 	defvar container_type generic
 
 	local userdir bindroot flags mtp src dst src_el dst_el
@@ -150,13 +152,11 @@ UCv() {
 
 confz_site_containers_user_check() {
 	checkvars containers_dir svscan_dir user
-	local display container param bind bind_dir bindroot chome uid gid
-	local -a fstab
 	require container_uidgid_for_name name=$vars[user] %uid %gid
-	bind=$'\tnone\tbind,nosuid,nodev\t0 0'
-	#uid="${${(s.:.)"$(getent passwd $vars[user])"}[3]}" \
-	#gid="${${(s.:.)"$(getent group $vars[user])"}[3]}" \
 
+	local ro="mount_ro=init ccx-dotfiles ccx-scripts"
+
+	local display
 	for display in 5 6 7 8; do
 		require container_service_xsession \
 			display_number=$display image_name=alpine-xsession \
@@ -242,28 +242,18 @@ confz_site_containers_user_check() {
 	UC  bzr                alpine-breezy          mount_rw=ccx-bzr $in_netns
 	UC  git                alpine-git             mount_rw=ccx-baregit $in_netns
 	UC  sndiod             alpine-sndio           $with_audio $in_netns
-	UC  mpd                void-mpd               mount_ro="init audio"
+	UC  mpd                void-mpd               "$ro init audio"
 	UC  {,}alpine-recombee                        mount_rw=ccx-git-recombee
 	UC  rcm-postgresql-dev alpine-postgresql-dev  mount_rw=ccx-git-recombee $in_netns
 	UC  spark              alpine-dev-spark       mount_rw="ccx-bzr ccx-git"
 	UC  ssrn-master-dev    alpine-postgresql-dev  mount_rw="ccx-bzr ccx-git" $in_netns
-	UC  pthbs-dev          alpine-pthbs-dev       mount_rw="ccx-bzr ccx-git" mount_ro=pthbs $in_netns
+	UC  pthbs-dev          alpine-pthbs-dev       mount_rw="ccx-bzr ccx-git" "$ro pthbs" $in_netns
 	# -- mail
 	UCa mail-net                   mount_rw="init mail-te2000.cz-ccx mail-disroot.org-ccx"
 	UC  {rcm,alpine}-mail-net      mount_rw="init mail-recombee.com-jan.pobrislo"
 	UC  mail      alpine-mail-read mount_rw="init mail-te2000.cz-ccx mail-disroot.org-ccx" $in_netns
 	UC  rcm-mail  alpine-mail-read mount_rw="init mail-recombee.com-jan.pobrislo" $in_netns
 
-	# 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=$container fstab_extra=${(F)fstab} \
-	# 	:containers_dir :svscan_dir :user
 }
 
 confz_site_container_services_check() {