safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

sed space fix, reinstall dead end

Browse Source
This commit is contained in:
root
2024-11-05 19:02:24 +01:00
parent 425e29c52a
commit b9cc2aeab9
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/scheduler/entrypoint.sh
View File

@@ -149,9 +149,9 @@ deploy_additionals(){
value=$(echo "$value" | sed 's/\//\\\//g') # escape / character value=$(echo "$value" | sed 's/\//\\\//g') # escape / character
# replace variables in secret and domain files # replace variables in secret and domain files
sed -i "s/#"$key"/"$value"/g" $SECRET_DIR/$NAME/$NAME.json; sed -i "s/#$key/$value/g" $SECRET_DIR/$NAME/$NAME.json;
#sed -i "s/#"$key"/"$value"/g" $SERVICE_DIR/domain-$NAME.json #sed -i "s/#"$key"/"$value"/g" $SERVICE_DIR/domain-$NAME.json
sed -i "s/#"$key"/"$value"/g" $SERVICE_DIR/*$NAME*.json sed -i "s/#$key/$value/g" $SERVICE_DIR/*$NAME*.json
done done
# start service # start service
@@ -667,6 +667,19 @@ execute_task() {
APP_TEMPLATE=$APP_DIR"/template.json" APP_TEMPLATE=$APP_DIR"/template.json"
TEMPLATE=$(cat $APP_TEMPLATE | base64 -w0) TEMPLATE=$(cat $APP_TEMPLATE | base64 -w0)
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0); JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0);
elif [ "$DEPLOY_ACTION" == "reinstall" ]; then
APP_TEMPLATE=$APP_DIR"/template.json"
TEMPLATE=$(cat $APP_TEMPLATE)
for LINE in $(cat $SERVICE_DIR/service-$DEPLOY_NAME.json | jq -rc '.containers[].ENVS[] | to_entries[]'); do
KEY=$(echo $LINE | jq -r .key);
VALUE=$(echo $LINE | jq -r .value);
debug "$KEY: $VALUE"
TEMPLATE=$(echo "$TEMPLATE" | jq -r '.fields |= map(if .key == "SMTP_MSG_SIZE" then .value = "'$VALUE'" else . end)');
#echo $TEMPLATE;
done;
TEMPLATE=$(echo "$TEMPLATE" | base64 -w0)
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0);
elif [ "$DEPLOY_ACTION" == "deploy" ]; then elif [ "$DEPLOY_ACTION" == "deploy" ]; then
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0); # deployment has started JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0); # deployment has started
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"; # web_in redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"; # web_in