mrrl-containers

commit 9319eb917b05102f098e53acba948c0f69cafe34
parent b580b975b8f2dc476c720eaaa0a7f849775b41f9
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 16 Dec 2021 19:25:43 +0000

Install Alpine with community repo by default
Diffstat:
M
zsh-functions/confz_containers_init
 | 
2
++
M
zsh-functions/confz_site_containers_init
 | 
13
+++++++------

2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -476,6 +476,8 @@ confz_container_generic_layout_check() {
 	require fs_o filename="$vars[root]/tmp" owner=$vars[uid]:$vars[gid]
 }
 
+# --- Alpine ---
+
 confz_container_alpine_base_layout_check() {
 	checkvars root
 	defvar uid 0
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -44,9 +44,10 @@ confz_site_container_services_check() {
 confz_site_container_alpine_check() {
 	checkvars containers_dir svscan_dir image_name packages
 	defvar arch x86_64
+	repositories 'main community'  # abduco lives in community
 
 	require container_alpine_image \
-		:containers_dir :arch :image_name
+		:containers_dir :arch :image_name :repositories
 	require container_alpine_packages_installed \
 		:containers_dir :svscan_dir :image_name :packages
 }
@@ -66,21 +67,21 @@ confz_site_container_images_check() {
 	checkvars containers_dir svscan_dir
 
 	local -a alpine_core=(
-		# abduco
 		s6
 		s6-{rc,linux-utils,portable-utils}
 		execline
 		ncurses-terminfo
-		# rxvt-unicode-terminfo
 		zsh
 	)
+	local -a alpine_community=(
+		abduco
+		rxvt-unicode-terminfo
+	)
 	require site_container_alpine :containers_dir :svscan_dir \
-		image_name=alpine-sndio packages="$alpine_core"
+		image_name=alpine-sndio packages="$alpine_community"
 
 	local -a void_core=(
 		abduco
-		dash  # used for /bin/sh
-		# busybox
 		s6
 		s6-{rc,linux-utils,portable-utils}
 		execline