utils/lxc.env: separate environment that is used in containers

Browse Source 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2020-03-01 18:28:10 +01:00
parent 37c135f2ce
commit 491cb95a1f
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -89,6 +89,7 @@ test.sh:
shellcheck -x utils/searx.sh
shellcheck -x utils/morty.sh
shellcheck -x utils/lxc.sh
shellcheck -x utils/lxc.env
shellcheck -x .config.sh
test.pep8: pyenvinstall

1
utils/filtron.sh
View File

@ -6,6 +6,7 @@
# shellcheck source=utils/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
source_dot_config
source "${REPO_ROOT}/utils/lxc.env"
# ----------------------------------------------------------------------------
# config

14
utils/lxc.env Normal file
View File

@ -0,0 +1,14 @@
# -*- coding: utf-8; mode: sh indent-tabs-mode: nil -*-
# SPDX-License-Identifier: AGPL-3.0-or-later
# Herein we place all, what is needed to know when inside containers. Its
# sourced from different context --> do not manipulate the environment directly,
# implement functions!
# shellcheck shell=sh
searx_suite_set_env() {
export FILTRON_API="0.0.0.0:4005"
export FILTRON_LISTEN="0.0.0.0:4004"
export MORTY_LISTEN="0.0.0.0:3000"
}

7
utils/lxc.sh
View File

@ -5,6 +5,7 @@
# shellcheck source=utils/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
source_dot_config
source "${REPO_ROOT}/utils/lxc.env"
# ----------------------------------------------------------------------------
# config
@ -63,12 +64,6 @@ HOST_USER="${SUDO_USER:-$USER}"
HOST_USER_ID=$(id -u "${HOST_USER}")
HOST_GROUP_ID=$(id -g "${HOST_USER}")
searx_suite_set_env() {
export FILTRON_API="0.0.0.0:4005"
export FILTRON_LISTEN="0.0.0.0:4004"
export MORTY_LISTEN="0.0.0.0:3000"
}
# ----------------------------------------------------------------------------
usage() {
# ----------------------------------------------------------------------------

1
utils/morty.sh
View File

@ -5,6 +5,7 @@
# shellcheck source=utils/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
source_dot_config
source "${REPO_ROOT}/utils/lxc.env"
# ----------------------------------------------------------------------------
# config

1
utils/searx.sh
View File

@ -6,6 +6,7 @@
# shellcheck source=utils/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
source_dot_config
source "${REPO_ROOT}/utils/lxc.env"
# ----------------------------------------------------------------------------
# config