docs: use make and uitls/searx.sh in containers

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

3 files changed, 16 insertions, 22 deletions

diff --git a/utils/lxc-searx.env b/utils/lxc-searx.env
index a5de6c3de..41bbae468 100644
--- a/utils/lxc-searx.env
+++ b/utils/lxc-searx.env
@@ -49,18 +49,6 @@ lxc_suite_install() {
     )
 }
 
-lxc_suite_prepare_buildhost() {
-    (
-        lxc_set_suite_env
-        FORCE_TIMEOUT=0
-        export FORCE_TIMEOUT
-        # "${LXC_REPO_ROOT}/utils/searx.sh* install packages
-        "${LXC_REPO_ROOT}/utils/searx.sh"   install buildhost
-        rst_title "buildhost installation finished ($(hostname))" part
-        echo
-    )
-}
-
 lxc_suite_info() {
     (
         lxc_set_suite_env
diff --git a/utils/lxc.sh b/utils/lxc.sh
index 2526a257d..612ca566d 100755
--- a/utils/lxc.sh
+++ b/utils/lxc.sh
@@ -82,7 +82,7 @@ usage::
   $_cmd [start|stop] [containers|<name>]
   $_cmd show         [info|config|suite|images]
   $_cmd cmd          [--|<name>] '...'
-  $_cmd install      [suite|base|buildhost]
+  $_cmd install      [suite|base]
 
 build
   :containers:   build, launch and 'install basic' packages on 'containers'
@@ -106,7 +106,6 @@ cmd
 install
   :suite:        install LXC suite; ${LXC_SUITE_INSTALL_INFO}
   :base:         prepare LXC; install basic packages
-  :buildhost:    prepare LXC; install buildhost packages
 
 EOF
     usage_images
@@ -150,7 +149,9 @@ main() {
 
     # don't check prerequisite when in recursion
     if [[ ! $1 == __* ]]; then
-        ! required_commands lxc && lxd_info && exit 42
+        if ! in_container; then
+            ! required_commands lxc && lxd_info && exit 42
+        fi
         [[ -z $LXC_SUITE ]] && err_msg "missing LXC_SUITE" && exit 42 
     fi
 
@@ -240,7 +241,7 @@ main() {
         install)
             sudo_or_exit
             case $2 in
-                suite|base|buildhost)
+                suite|base)
                     lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install "$2"
                     ;;
                 *) usage "$_usage"; exit 42 ;;
@@ -252,7 +253,6 @@ main() {
             case $2 in
                 suite) lxc_suite_install ;;
                 base) FORCE_TIMEOUT=0 lxc_install_base_packages ;;
-                buildhost) lxc_suite_prepare_buildhost ;;
             esac
             ;;
         doc)
diff --git a/utils/searx.sh b/utils/searx.sh
index 71ab978a1..17e8db84e 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -48,7 +48,7 @@ git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev
 shellcheck"
 
 BUILD_PACKAGES_debian="\
-graphviz imagemagick texlive-xetex librsvg2-bin
+firefox graphviz imagemagick texlive-xetex librsvg2-bin
 texlive-latex-recommended texlive-extra-utils ttf-dejavu"
 
 # pacman packages
@@ -59,7 +59,7 @@ git base-devel libxml2
 shellcheck"
 
 BUILD_PACKAGES_arch="\
-graphviz imagemagick texlive-bin extra/librsvg
+firefox graphviz imagemagick texlive-bin extra/librsvg
 texlive-core texlive-latexextra ttf-dejavu"
 
 # dnf packages
@@ -70,7 +70,7 @@ git @development-tools libxml2
 ShellCheck"
 
 BUILD_PACKAGES_fedora="\
-graphviz graphviz-gd ImageMagick librsvg2-tools
+firefox graphviz graphviz-gd ImageMagick librsvg2-tools
 texlive-xetex-bin texlive-collection-fontsrecommended
 texlive-collection-latex dejavu-sans-fonts dejavu-serif-fonts
 dejavu-sans-mono-fonts"
@@ -116,7 +116,7 @@ usage() {
 usage::
 
   $(basename "$0") shell
-  $(basename "$0") install    [all|user|searx-src|pyenv|uwsgi|apache|packages]
+  $(basename "$0") install    [all|user|searx-src|pyenv|uwsgi|apache|packages|buildhost]
   $(basename "$0") update     [searx]
   $(basename "$0") remove     [all|user|pyenv|searx-src]
   $(basename "$0") activate   [service]
@@ -135,7 +135,7 @@ install / remove
   :uwsgi:      install searx uWSGI application
   :settings:   reinstall settings from ${REPO_ROOT}/searx/settings.yml
   :packages:   install needed packages from OS package manager
-  :buildhost:  install packages from OS package manager needed by buildhost
+  :buildhost:  install packages from OS package manager needed by buildhosts
 update searx
   Update searx installation ($SERVICE_HOME)
 activate service
@@ -688,9 +688,15 @@ rst-doc() {
     local debian="${SEARX_PACKAGES_debian}"
     local arch="${SEARX_PACKAGES_arch}"
     local fedora="${SEARX_PACKAGES_fedora}"
+    local debian_build="${BUILD_PACKAGES_debian}"
+    local arch_build="${BUILD_PACKAGES_arch}"
+    local fedora_build="${BUILD_PACKAGES_fedora}"
     debian="$(echo "${debian}" | sed 's/.*/          & \\/' | sed '$ s/.$//')"
     arch="$(echo "${arch}"     | sed 's/.*/          & \\/' | sed '$ s/.$//')"
     fedora="$(echo "${fedora}" | sed 's/.*/          & \\/' | sed '$ s/.$//')"
+    debian_build="$(echo "${debian_build}" | sed 's/.*/          & \\/' | sed '$ s/.$//')"
+    arch_build="$(echo "${arch_build}"     | sed 's/.*/          & \\/' | sed '$ s/.$//')"
+    fedora_build="$(echo "${fedora_build}" | sed 's/.*/          & \\/' | sed '$ s/.$//')"
 
     eval "echo \"$(< "${REPO_ROOT}/docs/build-templates/searx.rst")\""