git.iko.soy/searx
on master help sign in
Merge branch 'filtron' of https://github.com/return42/searx into filtron
103c542Markus Heiser
utils/lib.sh+22
compare with master
unifiedsplit
@@ -1090,6 +1090,28 @@ touch "/.lxcenv"
1090ls -l "/.lxcenv"
1090ls -l "/.lxcenv"
1091EOF
1091EOF
1092}
1092}
1093+
1094+# apt packages
1095+LXC_BASE_PACKAGES_debian="git build-essential"
1096+
1097+# pacman packages
1098+LXC_BASE_PACKAGES_arch="git base-devel"
1099+
1100+# dnf packages
1101+LXC_BASE_PACKAGES_fedora="git @development-tools"
1102+
1103+case $DIST_ID in
1104+ ubuntu|debian) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_debian}" ;;
1105+ arch) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_arch}" ;;
1106+ fedora) LXC_BASE_PACKAGES="${LXC_BASE_PACKAGES_fedora}" ;;
1107+ *) err_msg "$DIST_ID-$DIST_VERS: pkg_install LXC_BASE_PACKAGES not yet implemented" ;;
1108+esac
1109+
1110+lxc_install_base_packages() {
1111+ info_msg "install LXC_BASE_PACKAGES in container $1"
1112+ pkg_install "${LXC_BASE_PACKAGES}"
1113+}
1114+
1093lxc_exists(){
1115lxc_exists(){
1094
1116
1095 # usage: lxc_exists <name> || echo "container <name> does not exists"
1117 # usage: lxc_exists <name> || echo "container <name> does not exists"
utils/lxc.sh+12−5
@@ -82,10 +82,10 @@ usage::
82 $_cmd [start|stop] [containers|<name>]
82 $_cmd [start|stop] [containers|<name>]
83 $_cmd show [info|config|suite|images]
83 $_cmd show [info|config|suite|images]
84 $_cmd cmd [--|<name>] '...'
84 $_cmd cmd [--|<name>] '...'
85− $_cmd install [suite|buildhost]
85+ $_cmd install [suite|base|buildhost]
86
86
87build
87build
88− :containers: build & launch all LXC containers of the suite
88+ :containers: build, launch and 'install basic' packages on 'containers'
89copy:
89copy:
90 :images: copy remote images of the suite into local storage
90 :images: copy remote images of the suite into local storage
91remove
91remove
@@ -105,7 +105,8 @@ cmd
105 :<name>: run command '...' in container <name>
105 :<name>: run command '...' in container <name>
106install
106install
107 :suite: install LXC suite; ${lxc_suite_install_info}
107 :suite: install LXC suite; ${lxc_suite_install_info}
108+ :base: prepare LXC; install basic packages
108− :buildhost: prepare LXC; buildhost
109+ :buildhost: prepare LXC; install buildhost packages
109
110
110EOF
111EOF
111 usage_images
112 usage_images
@@ -217,6 +218,7 @@ main() {
217 esac
218 esac
218 ;;
219 ;;
219 __show)
220 __show)
221+ # wrapped show commands, called once in each container
220 case $2 in
222 case $2 in
221 suite) lxc_suite_info ;;
223 suite) lxc_suite_info ;;
222 esac
224 esac
@@ -238,14 +240,17 @@ main() {
238 install)
240 install)
239 sudo_or_exit
241 sudo_or_exit
240 case $2 in
242 case $2 in
241− suite) lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install suite;;
243+ suite|base|buildhost)
242− buildhost) lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install buildhost;;
244+ lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install $2
245+ ;;
243 *) usage "$_usage"; exit 42 ;;
246 *) usage "$_usage"; exit 42 ;;
244 esac
247 esac
245 ;;
248 ;;
246 __install)
249 __install)
250+ # wrapped install commands, called once in each container
247 case $2 in
251 case $2 in
248 suite) lxc_suite_install ;;
252 suite) lxc_suite_install ;;
253+ base) FORCE_TIMEOUT=0 lxc_install_base_packages ;;
249 buildhost) lxc_suite_prepare_buildhost ;;
254 buildhost) lxc_suite_prepare_buildhost ;;
250 esac
255 esac
251 ;;
256 ;;
@@ -269,6 +274,8 @@ build_instances() {
269 lxc_config_containers
274 lxc_config_containers
270 lxc_boilerplate_containers
275 lxc_boilerplate_containers
271 echo
276 echo
277+ lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install base
278+ echo
272 lxc list "$LXC_HOST_PREFIX"
279 lxc list "$LXC_HOST_PREFIX"
273}
280}
274
281