commit 85bf9b3af64dd9b4b6e3ac22678f76203ac05ee4 parent 612670e199c9ee4b6fda76fdf5bdc0cefd09c65e Author: ccx <ccx@te2000.cz> Date: Mon, 26 Aug 2024 11:51:17 +0000 Repeat alpine install, socks container Diffstat:
| M | zsh-functions/confz_containers_init | | | 15 | ++++++++++----- |
| M | zsh-functions/confz_site_containers_init | | | 3 | ++- |
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init @@ -1107,14 +1107,19 @@ confz_container_alpine_packages_installed_check() { for pkg in $=vars[packages]; do (( $installed[(I)${pkg}] )) || missing+=( $pkg ) done + (( $#missing == 0 )) && return 0 - do_command=( - $commands[cd] $vars[sysroot_svc] container_sysroot_run - /sbin/apk add --no-chown $missing - ) + typeset -ga container_alpine_packages_missing + container_alpine_packages_missing=( $missing ) fail_reason="Following packages are not installed: $missing (req:${#$=vars[packages]} ins:$#installed)" - (( $#missing == 0 )) + return 1 +} +confz_container_alpine_packages_installed_do() { + $commands[cd] $vars[sysroot_svc] container_sysroot_run \ + /sbin/apk add --no-chown $container_alpine_packages_missing || + $commands[cd] $vars[sysroot_svc] container_sysroot_run \ + /sbin/apk add --no-chown $container_alpine_packages_missing } # --- Void --- diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init @@ -207,8 +207,9 @@ confz_site_containers_user_check() { UCa tinyproxy UCa tor UCa mpv + UC socks alpine-tinyproxy "$ro versions" UCa ssh - UCa pass mount_rw="ccx-password-store" + UCa pass mount_rw="ccx-password-store" $in_netns UC rcm-ssh alpine-ssh "$ro rcm-devops versions" $with_more_fds UCa socials $in_netns UCa gpg $with_usb $in_netns