mirror of
https://gitlab.com/Snogard/kaido.git
synced 2025-06-25 02:13:00 +02:00
renamed CONTAINERS_FOLDER to KAIDO_CONTAINER_FOLDER, renamed BUILDS_FOLDER to KAIDO_BUILD_FOLDER
This commit is contained in:
parent
7a8fe7907b
commit
667e348edd
@ -61,8 +61,8 @@ warning: No parameters are supported yet
|
||||
### /etc/kaido/envs.sh
|
||||
This file will be sourced to overrwrite default envs
|
||||
|
||||
CONTAINERS_FOLDER: where container folders are created by default (not fully implemented)
|
||||
BUILDS_FOLDER: where files are downloaded for build purposes
|
||||
KAIDO_CONTAINER_FOLDER: where container folders are created by default (not fully implemented)
|
||||
KAIDO_BUILD_FOLDER: where files are downloaded for build purposes
|
||||
KAIDO_CONFIG_FOLDER: where kaido will look for a kaido-config repository
|
||||
|
||||
# Container Installation:
|
||||
|
@ -12,7 +12,7 @@ buildDataPath=""
|
||||
set_script_path $prefix $scriptName
|
||||
set_build_data_path $scriptName
|
||||
|
||||
buildPath="$BUILDS_FOLDER/$scriptName"
|
||||
buildPath="$KAIDO_BUILD_FOLDER/$scriptName"
|
||||
|
||||
if [ -d "$buildPath" ]; then
|
||||
sudo rm -rf "$buildPath"
|
||||
|
@ -10,7 +10,7 @@ imageName=docker.io/gitlab/gitlab-runner:alpine3.18-v16.6.1
|
||||
containerName=gitlab-runner
|
||||
architecture=$(arch)
|
||||
|
||||
srcFolder=$CONTAINERS_FOLDER/$containerName/
|
||||
srcFolder=$KAIDO_CONTAINER_FOLDER/$containerName/
|
||||
srcSock=/var/run/user/$userID/podman/podman.sock
|
||||
|
||||
# pre install
|
||||
|
@ -18,7 +18,7 @@ imageName_db=docker.io/library/mariadb:11.0.2
|
||||
imageName_redis=docker.io
|
||||
imageName_smtp=docker.io
|
||||
|
||||
dstBasePath=$CONTAINERS_FOLDER/$podName
|
||||
dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName
|
||||
|
||||
dstNextcloudPath=$dstBasePath/nextcloud
|
||||
dstAppsPath=$dstBasePath/apps
|
||||
|
@ -7,7 +7,7 @@ source /opt/kaido/src/libs/bash/lib.sh
|
||||
imageName=docker.io/linuxserver/transmission:4.0.5-r0-ls226
|
||||
containerName=transmission
|
||||
|
||||
dstBasePath="$CONTAINERS_FOLDER/$containerName"
|
||||
dstBasePath="$KAIDO_CONTAINER_FOLDER/$containerName"
|
||||
|
||||
dstConfigPath="$dstBasePath/config"
|
||||
dstDownloadPath="$dstBasePath/downloads"
|
||||
|
@ -11,7 +11,7 @@ containerName_db=${podName}_db
|
||||
imageName_web=docker.io/tzahi12345/youtubedl-material:4.3.2
|
||||
imageName_db=docker.io/library/mongo:4.4.22
|
||||
|
||||
dstBasePath=$CONTAINERS_FOLDER/$podName
|
||||
dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName
|
||||
dstAppDataPath=$dstBasePath/appdata
|
||||
dstUsersPath=$dstBasePath/users
|
||||
dstDBPath=$dstBasePath/db
|
||||
|
@ -1,9 +1,13 @@
|
||||
CONTAINERS_FOLDER="$HOME/.local/share/kaido/containers"
|
||||
BUILDS_FOLDER="$HOME/.cache/kaido/build"
|
||||
# default folder where the container data will be saved
|
||||
KAIDO_CONTAINER_FOLDER="$HOME/.local/share/kaido/containers"
|
||||
# default folder used by the build scripts
|
||||
KAIDO_BUILD_FOLDER="$HOME/.cache/kaido/build"
|
||||
|
||||
|
||||
HOME_KAIDO_CONFIG_FOLDER="$HOME/.config/kaido"
|
||||
SYSTEM_KAIDO_CONFIG_FOLDER="/etc/kaido"
|
||||
|
||||
# where user config are stored
|
||||
KAIDO_CONFIG_FOLDER=$SYSTEM_KAIDO_CONFIG_FOLDER
|
||||
if [ -d "$HOME_KAIDO_CONFIG_FOLDER" ]; then
|
||||
KAIDO_CONFIG_FOLDER=$HOME_KAIDO_CONFIG_FOLDER
|
||||
@ -12,3 +16,15 @@ fi
|
||||
if [ -f "$KAIDO_CONFIG_FOLDER/envs.sh" ]; then
|
||||
source "$KAIDO_CONFIG_FOLDER/envs.sh"
|
||||
fi
|
||||
|
||||
if [ ! -z "$CONTAINERS_FOLDER" ]; then
|
||||
echo "WARNING: please replace CONTAINERS_FOLDER with KAIDO_CONTAINER_FOLDER in you envs config"
|
||||
echo "INFO: setting KAIDO_CONTAINER_FOLDER to CONTAINERS_FOLDER for compatibility reason (will be removed in future releases)"
|
||||
KAIDO_CONTAINER_FOLDER=$CONTAINERS_FOLDER
|
||||
fi
|
||||
|
||||
if [ ! -z "$BUILDS_FOLDER" ]; then
|
||||
echo "WARNING: please replace BUILDS_FOLDER with KAIDO_BUILD_FOLDER in you envs config"
|
||||
echo "INFO: setting KAIDO_BUILD_FOLDER as BUILDS_FOLDER for compatibility reason (will be removed in future releases)"
|
||||
KAIDO_BUILD_FOLDER=$BUILDS_FOLDER
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user