Merge branch 'main' of https://git.format.hu/safebox/framework-scheduler

.drone.yml

@@ -3,7 +3,7 @@ type: kubernetes
 name: default
 
 node_selector:
-  physical-node: dev2
+  physical-node: dev1
 
 trigger:
   event:
@@ -27,6 +27,8 @@ steps:
         from_secret: dev-hu-registry-username
       password: 
         from_secret: dev-hu-registry-password
+      mirror:
+        from_secret: hub_docker_mirror
       platforms:
         - linux/amd64
         - linux/arm64

Dockerfile

@@ -14,7 +14,7 @@ FROM alpine:latest
 # COPY --from=redis-source /usr/src/redis/src/redis-cli /usr/bin/redis-cli
 # RUN chmod +x /usr/bin/redis-cli
 
-RUN apk add --update --no-cache docker-cli wget curl dos2unix jq openssl git coreutils inotify-tools acl
+RUN apk add --update --no-cache docker-cli wget curl dos2unix jq openssl git coreutils inotify-tools acl apache2-utils
 
 COPY scripts/scheduler/*.sh /scripts/
 RUN find ./scripts -name "*.sh" | xargs dos2unix

scripts/scheduler/entrypoint.sh

@@ -30,6 +30,7 @@ REDIS_VERSION=${REDIS_VERSION:-latest}
 
 SOURCE=${SOURCE:-user-config}
 SMARTHOST_PROXY_PATH=$SMARTHOST_PROXY_PATH
+HTPASSWD_FILE=${HTPASSWD_FILE:-/etc/system/config/smarthost-proxy/nginx/htpasswd}
 
 GIT_URL=${GIT_URL:-git.format.hu}
 REPO=$REPO
@@ -99,6 +100,19 @@ if [ -d /etc/user/config/services ]; then
     done
 fi
 
+create_htpasswd_file() {
+
+    local USER="$1"
+    local PASSWD="$2"
+
+    if [ ! -f "$HTPASSWD_FILE" ]; then
+        install -m 664 -g 65534 /dev/null $HTPASSWD_FILE
+        htpasswd -cb $HTPASSWD_FILE $USER $PASSWD
+    fi
+}
+
+install -m 664 -g 65534 /dev/null
+
 deploy_additionals() {
 
     local DIR="$1"
@@ -460,7 +474,7 @@ check_update() {
     CURL_CHECK_CODE=$(eval $CURL_CHECK)
 
     # if valid accessible url
-    if [[ "$CURL_CHECK_CODE" == "200" ]] ; then
+    if [[ "$CURL_CHECK_CODE" == "200" ]]; then
         debug "$REMOTE_URL repository accessed successfully"
 
         #digest=$(curl --silent -H "Accept: application/vnd.docker.distribution.manifest.v2+json" "$REMOTE_URL" | jq -r '.config.digest');
@@ -542,13 +556,12 @@ upgrade() {
 
     else
 
-		debug "$service_exec service-$NAME.json start info"
+        debug "$service_exec $NAME.json start info"
-		$service_exec service-$NAME.json stop force
+        $service_exec $NAME.json stop force
-		$service_exec service-$NAME.json start info &
+        $service_exec $NAME.json start info &
     fi
 }
 
-
 execute_task() {
     TASK="$1"
     B64_JSON="$2"