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

Compare commits

base: safebox:e6e772055eca177d695d8109e02a396a22aaaa7b
Branches Tags
safebox:main
safebox:1.1.5 safebox:1.1.4 safebox:1.1.3 safebox:1.1.2 safebox:1.1.1 safebox:1.1.0 safebox:1.0.9 safebox:1.0.8 safebox:1.0.7 safebox:1.0.6 safebox:1.0.5 safebox:1.0.4 safebox:1.0.3 safebox:1.0.2 safebox:1.0.1 safebox:latest
..
compare: safebox:1.0.9
Branches Tags
safebox:main
safebox:1.1.5 safebox:1.1.4 safebox:1.1.3 safebox:1.1.2 safebox:1.1.1 safebox:1.1.0 safebox:1.0.9 safebox:1.0.8 safebox:1.0.7 safebox:1.0.6 safebox:1.0.5 safebox:1.0.4 safebox:1.0.3 safebox:1.0.2 safebox:1.0.1 safebox:latest

4 Commits
e6e772055e ... 1.0.9

Author SHA1 Message Date
hael
6876c9351b Merge branch 'main' of https://git.format.hu/safebox/framework-scheduler
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2025-07-24 08:35:27 +00:00
hael
4df278bb0b save_vpn changes 2025-07-24 08:35:10 +00:00
gyurix
550661c205 Add debug mode environment variable handling in upgrade_scheduler function
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2025-07-24 10:18:54 +02:00
gyurix
131982b37f Refactor upgrade_scheduler function to streamline debug mode handling and simplify Docker start command 2025-07-24 10:17:23 +02:00
2 changed files with 17 additions and 10 deletions
Expand all files Collapse all files

9
scripts/scheduler/entrypoint.sh
View File

@@ -715,11 +715,11 @@ upgrade_scheduler() {
debug "Upgrading framework scheduler..." debug "Upgrading framework scheduler..."
/usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION" /usr/bin/docker pull "$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
if [ "$DEBUG_MODE" == "true" ]; then if [ "$DEBUG_MODE" == "true" ]; then
DOCKER_START="--entrypoint=sh $DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION -c 'sleep 86400'"
SET_DEBUG_MODE="--env DEBUG_MODE=true" SET_DEBUG_MODE="--env DEBUG_MODE=true"
else else
DOCKER_START="$DOCKER_REGISTRY_URL/$FRAMEWORK_SCHEDULER_IMAGE:$FRAMEWORK_SCHEDULER_VERSION"
SET_DEBUG_MODE="" SET_DEBUG_MODE=""
fi fi
@@ -1107,6 +1107,9 @@ execute_task() {
elif [ "$TASK_NAME" == "save_vpn" ]; then elif [ "$TASK_NAME" == "save_vpn" ]; then
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "RESULT": "" }' | jq -r . | base64 -w0)
add_json_target
VPN_PROXY_REPO="wireguard-proxy-client" VPN_PROXY_REPO="wireguard-proxy-client"
if [ ! -d "/tmp/$VPN_PROXY_REPO" ]; then if [ ! -d "/tmp/$VPN_PROXY_REPO" ]; then
git clone https://git.format.hu/safebox/$VPN_PROXY_REPO.git /tmp/$VPN_PROXY_REPO >/dev/null git clone https://git.format.hu/safebox/$VPN_PROXY_REPO.git /tmp/$VPN_PROXY_REPO >/dev/null
@@ -1124,7 +1127,7 @@ execute_task() {
# install vpn only # install vpn only
sh /scripts/install.sh "$B64_JSON" "$service_exec" "vpn" "$GLOBAL_VERSION" sh /scripts/install.sh "$B64_JSON" "$service_exec" "vpn" "$GLOBAL_VERSION"
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "'$VPN_STATUS'", "RESULT": "'$VPN_RESULT'" }' | jq -r . | base64 -w0) JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1", "RESULT": "'$VPN_RESULT'" }' | jq -r . | base64 -w0)
elif [ "$TASK_NAME" == "containers" ]; then # not in use elif [ "$TASK_NAME" == "containers" ]; then # not in use
CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -v framework-scheduler) CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -v framework-scheduler)

18
scripts/scheduler/install.sh
View File

@@ -200,14 +200,18 @@ elif [ "$FIRST_INSTALL" == "vpn" ]; then
get_vpn_key get_vpn_key
edit_user_json $LETSENCRYPT_MAIL $LETSENCRYPT_SERVERNAME if [ "$VPN_PROXY" != "no" ]; then
$SERVICE_EXEC vpn-proxy stop force edit_user_json $LETSENCRYPT_MAIL $LETSENCRYPT_SERVERNAME
$SERVICE_EXEC vpn-proxy start
echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$AUTO_START_SERVICES/.init_services $SERVICE_EXEC vpn-proxy stop force
echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >>$AUTO_START_SERVICES/.init_services $SERVICE_EXEC vpn-proxy start
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >>$AUTO_START_SERVICES/.init_services echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >>$AUTO_START_SERVICES/.init_services echo "$INIT_SERVICE_PATH/firewall-vpn-smarthost-loadbalancer" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-postrouting" >>$AUTO_START_SERVICES/.init_services
echo "$INIT_SERVICE_PATH/firewall-vpn-proxy-prerouting" >>$AUTO_START_SERVICES/.init_services
fi;
exit exit