updated some scripts

This commit is contained in:
Snogard 2023-07-08 11:48:34 +02:00
parent a86baecffb
commit 9417594ca5
3 changed files with 13 additions and 5 deletions

View File

@ -1,16 +1,17 @@
#!/bin/baash #!/bin/baash
source /opt/kaido/src/libs/bash/lib.sh source /opt/kaido/src/libs/bash/lib.sh
option=$1 userID=$1
token=$2 option=$2
token=$3
# setup # setup
imageName=docker.io/gitlab/gitlab-runner:alpine3.18-v16.1.0 imageName=docker.io/gitlab/gitlab-runner:alpine3.18-v16.1.0
containerName=gitlab-runner containerName=gitlab-runner
architecture=$(arch) architecture=$(arch)
srcFolder=/mnt/storage/containers/$containerName/ srcFolder=$CONTAINERS_FOLDER/$containerName/
srcSock=/var/run/user/1001/podman/podman.sock srcSock=/var/run/user/$userID/podman/podman.sock
# pre install # pre install
create_folder $srcFolder create_folder $srcFolder

View File

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
source "src/commands/install/install-gitlab-runner.sh"
# variables # variables
root=/opt/kaido root=/opt/kaido
@ -28,6 +29,12 @@ if [ ! -d "${workdir}" ]; then
fi fi
# ---------------------- # ----------------------
if [ -d "$MASTER_CONFIG_FOLDER" ]; then
cd "$MASTER_CONFIG_FOLDER"
git pull
fi
# read config files # read config files
installList=$(cat ${updateConfig} | grep -i install-) installList=$(cat ${updateConfig} | grep -i install-)
configureList=$(cat ${updateConfig} | grep -i configure-) configureList=$(cat ${updateConfig} | grep -i configure-)

View File

@ -1,3 +1,3 @@
#TODO: make envs configurable #TODO: make envs configurable
CONTAINERS_FOLDER="/mnt/storage/containers" CONTAINERS_FOLDER="/mnt/storage/containers"
MASTER_CONFIG_FOLDER="/opt/kaido/configuration" MASTER_CONFIG_FOLDER="$HOME/.config/kaido"