mrrl-containers

commit cc37e23b0c38af3adb6177823474e8b4eb524003
parent 17a6b85d2830537a50336f8ea39fbfd45d079420
Author: ccx <ccx@te2000.cz>
Date:   Fri, 21 Jun 2024 16:10:56 +0000

Add wget for gentoo-prefix

Diffstat:
M
zsh-functions/confz_containers_init
 | 
6
+++---
M
zsh-functions/confz_site_containers_init
 | 
11
+++++++++--

2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -840,9 +840,9 @@ confz_container_alpine_base_layout_check() {
 	require fs_m filename="$vars[root]/lib/mdev" mode=0755
 	require fs_o filename="$vars[root]/lib/mdev" owner=$vars[uid]:$vars[gid]
 
-	#require fs_d filename="$vars[root]/opt"
-	#require fs_m filename="$vars[root]/opt" mode=0755
-	#require fs_o filename="$vars[root]/opt" owner=$vars[uid]:$vars[gid]
+	require fs_d filename="$vars[root]/opt"
+	require fs_m filename="$vars[root]/opt" mode=0755
+	require fs_o filename="$vars[root]/opt" owner=$vars[uid]:$vars[gid]
 
 	require fs_d filename="$vars[root]/proc"
 	require fs_m filename="$vars[root]/proc" mode=0755
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -8,7 +8,7 @@ typeset -gA site_containers_mountpoints=(
 	ccx-password-store	/home/ccx/bzr/password-store
 	ccx-development	/home/ccx/development
 	ccx-baregit	/home/ccx/baregit
-	ccx-opt	/home/ccx/opt
+	#ccx-opt	/home/ccx/opt
 	rcm-devops	/mnt/volumes/containers/user/ccx/git/home/ccx/git/rcm-devops
 	# ccx-git	/home/ccx/git
 	# ccx-git-recombee	/home/ccx/git/recombee
@@ -190,6 +190,12 @@ confz_site_containers_user_check() {
 	)
 	local with_audio=prepare_chroot=${(F)el_mount_audio_devices}
 
+	local -a el_mount_ccx_opt=(
+		"#!$(which execlineb) -P"
+		'if { mount -o bind,ro /home/ccx/opt ./opt }'
+	)
+	local with_opt=prepare_chroot=${(F)el_mount_ccx_opt}
+
 	UC  alpine-browsers
 	UC  pentoo
 	UCa weechat
@@ -247,7 +253,7 @@ confz_site_containers_user_check() {
 	UC  spark              alpine-dev-spark       mount_rw="ccx-bzr"
 	UC  ssrn-master-dev    alpine-postgresql-dev  mount_rw="ccx-bzr" $in_netns
 	UC  pthbs-dev          alpine-pthbs-dev       mount_rw="ccx-bzr" "$ro pthbs" $in_netns
-	UC  gentoo-prefix-dev  alpine-gentoo-dev      mount_rw="ccx-opt" "$ro pthbs"
+	UC  gentoo-prefix-dev  alpine-gentoo-dev      $with_opt "$ro pthbs"
 	# -- 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"
@@ -721,6 +727,7 @@ confz_site_container_images_check() {
 	local -a alpine_dev_gentoo=(
 		$alpine_dev_py3
 		bash
+		wget
 		mandoc man-pages mandoc-apropos
 		git
 		git-daemon