fully support KAIDO_CONTAINER_FOLDER env

This commit is contained in:
Snogard 2024-03-20 14:28:17 +01:00
parent 667e348edd
commit 8cd9db2b40
10 changed files with 13 additions and 14 deletions

View File

@ -61,7 +61,7 @@ warning: No parameters are supported yet
### /etc/kaido/envs.sh ### /etc/kaido/envs.sh
This file will be sourced to overrwrite default envs This file will be sourced to overrwrite default envs
KAIDO_CONTAINER_FOLDER: where container folders are created by default (not fully implemented) KAIDO_CONTAINER_FOLDER: where container folders are created by default
KAIDO_BUILD_FOLDER: where files are downloaded for build purposes KAIDO_BUILD_FOLDER: where files are downloaded for build purposes
KAIDO_CONFIG_FOLDER: where kaido will look for a kaido-config repository KAIDO_CONFIG_FOLDER: where kaido will look for a kaido-config repository

View File

@ -5,7 +5,7 @@ source /opt/kaido/src/libs/bash/lib.sh
containerName=aria-rpc containerName=aria-rpc
srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config" srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config"
dstConfigPath=/mnt/storage/containers/$containerName/config dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
systemctl stop --user $containerName systemctl stop --user $containerName

View File

@ -3,7 +3,7 @@ source /opt/kaido/src/libs/bash/lib.sh
containerName=reverse-proxy containerName=reverse-proxy
srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config" srcConfigPath="$KAIDO_CONFIG_FOLDER/containers/$containerName/config"
dstConfigPath=/mnt/storage/containers/$containerName/config dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
if [ ! -d $srcConfigPath ]; then if [ ! -d $srcConfigPath ]; then
echo "Failed config: reverse-proxy" echo "Failed config: reverse-proxy"

View File

@ -6,8 +6,8 @@ source /opt/kaido/src/libs/bash/lib.sh
imageName=docker.io/p3terx/aria2-pro:latest imageName=docker.io/p3terx/aria2-pro:latest
containerName=aria-rpc containerName=aria-rpc
dstConfigPath=/mnt/storage/containers/$containerName/config dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
dstDownloadPath=/mnt/storage/containers/$containerName/downloads dstDownloadPath="$KAIDO_CONTAINER_FOLDER/$containerName/downloads"
# envs # envs

View File

@ -10,7 +10,7 @@ imageName=localhost/foundry:version-$instanceVersion
baseContainerName=foundry baseContainerName=foundry
containerName=$baseContainerName-$instanceName containerName=$baseContainerName-$instanceName
dstDataPath=/mnt/storage/containers/$containerName/data dstDataPath="$KAIDO_CONTAINER_FOLDER/$containerName/data"
# envs # envs

View File

@ -7,8 +7,8 @@ imageName=docker.io/gotson/komga:1.10.4
containerName=komga containerName=komga
dstConfigPath=/mnt/storage/containers/$containerName/config dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
dstDataPath=/mnt/storage/containers/$containerName/data dstDataPath="$KAIDO_CONTAINER_FOLDER/$containerName/data"
# envs # envs

View File

@ -18,7 +18,7 @@ imageName_db=docker.io/library/mariadb:11.0.2
imageName_redis=docker.io imageName_redis=docker.io
imageName_smtp=docker.io imageName_smtp=docker.io
dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName dstBasePath="$KAIDO_CONTAINER_FOLDER/$podName"
dstNextcloudPath=$dstBasePath/nextcloud dstNextcloudPath=$dstBasePath/nextcloud
dstAppsPath=$dstBasePath/apps dstAppsPath=$dstBasePath/apps

View File

@ -6,8 +6,7 @@ source /opt/kaido/src/libs/bash/lib.sh
imageName=docker.io/pihole/pihole:2024.02.2 imageName=docker.io/pihole/pihole:2024.02.2
containerName=pihole containerName=pihole
srcConfigPath=/home-server/configuration/$containerName baseConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
baseConfigPath=/mnt/storage/containers/$containerName/config
dstPiholeConfigPath=$baseConfigPath/pihole dstPiholeConfigPath=$baseConfigPath/pihole
dstDnsmasqConfigPath=$baseConfigPath/dnsmasq dstDnsmasqConfigPath=$baseConfigPath/dnsmasq

View File

@ -6,7 +6,7 @@ source /opt/kaido/src/libs/bash/lib.sh
imageName=docker.io/linuxserver/swag:2.8.0-ls263 imageName=docker.io/linuxserver/swag:2.8.0-ls263
containerName=reverse-proxy containerName=reverse-proxy
dstConfigPath=/mnt/storage/containers/$containerName/config dstConfigPath="$KAIDO_CONTAINER_FOLDER/$containerName/config"
# envs # envs
timezone="Europe/Rome" timezone="Europe/Rome"
@ -17,7 +17,7 @@ email="example@example.com"
if [ -f "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" ]; then if [ -f "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" ]; then
source "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" source "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh"
else else
echo "You must configure this container with this file: "$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh" echo "You must configure this container with this file: '$KAIDO_CONFIG_FOLDER/containers/$containerName/envs.sh'"
exit 1 exit 1
fi fi

View File

@ -11,7 +11,7 @@ containerName_db=${podName}_db
imageName_web=docker.io/tzahi12345/youtubedl-material:4.3.2 imageName_web=docker.io/tzahi12345/youtubedl-material:4.3.2
imageName_db=docker.io/library/mongo:4.4.22 imageName_db=docker.io/library/mongo:4.4.22
dstBasePath=$KAIDO_CONTAINER_FOLDER/$podName dstBasePath="$KAIDO_CONTAINER_FOLDER/$podName"
dstAppDataPath=$dstBasePath/appdata dstAppDataPath=$dstBasePath/appdata
dstUsersPath=$dstBasePath/users dstUsersPath=$dstBasePath/users
dstDBPath=$dstBasePath/db dstDBPath=$dstBasePath/db