=== modified file 'zsh-functions/confz_site_containers_init' --- old/zsh-functions/confz_site_containers_init 2022-06-27 21:46:09 +0000 +++ new/zsh-functions/confz_site_containers_init 2022-06-27 21:24:59 +0000 @@ -19,7 +19,7 @@ } confz_site_containers_user_check() { checkvars containers_dir svscan_dir user - local display container bind bind_dir bindroot chome uid gid + local display container bind bind_dir bindroot uid gid local -a fstab bind=$'\tnone\tbind,nosuid,nodev\t0 0' uid="${${(s.:.)"$(getent passwd $vars[user])"}[3]}" \ @@ -42,47 +42,34 @@ 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 - container=alpine-sndio - bindroot=$vars[containers_dir]/user/$vars[user]/$container/root + bindroot=$vars[containers_dir]/user/$vars[user]/alpine-sndio/root require container_service_alsa \ - image_name=$container \ + image_name=alpine-sndio \ :containers_dir :svscan_dir :user - 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 + # bind-mounts for alpine-dev + bindroot=$vars[containers_dir]/user/$vars[user]/alpine-dev/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} \ + image_name=alpine-dev 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 - 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 + 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 fstab=( /home/$vars[user]/git/recombee$'\t'$bindroot/home/$vars[user]/git/recombee$bind ) require container_service_generic \ - image_name=$container fstab_extra=${(F)fstab} \ + image_name=alpine-recombee fstab_extra=${(F)fstab} \ :containers_dir :svscan_dir :user }