mrrl-containers

commit 61c0c913353732d2e00698348a0e0528bb307c97
parent f7630e4578360945fa034b1d54fafc242b60fc7f
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Mon,  5 Dec 2022 22:19:55 +0100

Restructure Alpine package list, add tmux to terminal ones
Diffstat:
M
zsh-functions/confz_site_containers_init
 | 
37
+++++++++++++++++++++++++------------

1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -239,6 +239,24 @@ confz_site_container_images_check() {
 		xrdb
 	)
 
+	local -a alpine_terminal=(
+		$alpine_community
+		tmux
+		strace
+		vis
+		# man-db
+	)
+
+	local -a alpine_dev_core=(
+		$alpine_terminal
+		vim
+		ripgrep delta bat
+		git
+		make
+		patch
+		rsync
+	)
+
 	require site_container_alpine :containers_dir :svscan_dir \
 		image_name=alpine-sndio \
 		packages="$alpine_community sndio alsa-utils strace tmux"
@@ -259,23 +277,23 @@ confz_site_container_images_check() {
 	require site_container_alpine :containers_dir :svscan_dir \
 		repositories="main community testing" \
 		image_name=alpine-senpai \
-		packages="$alpine_community senpai senpai-doc man-db"
+		packages="$alpine_terminal senpai senpai-doc man-db"
 
 	require site_container_alpine :containers_dir :svscan_dir \
 		repositories="main community testing" \
-		image_name=alpine-profanity packages="$alpine_community profanity"
+		image_name=alpine-profanity packages="$alpine_terminal profanity"
 
 	require site_container_alpine :containers_dir :svscan_dir \
 		repositories="main community testing" \
-		image_name=alpine-gomuks packages="$alpine_community gomuks"
+		image_name=alpine-gomuks packages="$alpine_terminal gomuks"
 
 	require site_container_alpine :containers_dir :svscan_dir \
 		repositories="main community testing" \
 		image_name=alpine-haskell \
-		packages="$alpine_community stack git make"
+		packages="$alpine_terminal stack git make"
 
 	local -a alpine_mail=(
-		$alpine_community
+		$alpine_terminal
 		make patch
 		mandoc
 		elinks w3m lynx
@@ -291,16 +309,11 @@ confz_site_container_images_check() {
 		image_name=alpine-mail packages="$alpine_mail"
 
 	local -a alpine_dev_spark=(
-		$alpine_community
+		$alpine_dev_core
 		postgresql14
 		py3-psycopg2 py3-wheel py3-pip
-		tmux
-		vim
-		ripgrep delta bat
 		openssh
-		git breezy
-		make
-		patch
+		breezy
 		rsync
 	)
 	require site_container_alpine :containers_dir :svscan_dir \