9 Commits

Author SHA1 Message Date
f2c82d24e2 Update .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2025-04-23 22:33:13 +00:00
0fdbac0ea8 Update .drone.yml
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2025-04-23 22:10:45 +00:00
638f51eaa6 Update .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2025-04-23 21:49:19 +00:00
0f9850d6f8 Update .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2025-04-23 20:02:02 +00:00
c26a2f6efb Update .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2025-04-23 19:53:37 +00:00
5af97a3714 Update .drone.yml
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2025-04-23 19:42:02 +00:00
6d73464c70 Update .drone.yml
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2025-04-23 16:23:32 +00:00
gyurix
ea9c55b6bf Add apache2-utils to Dockerfile and implement htpasswd file creation in entrypoint script
All checks were successful
continuous-integration/drone/push Build is passing
2025-04-22 11:56:42 +02:00
3088f3904f service- prefix removed from upgrade
All checks were successful
continuous-integration/drone/push Build is passing
2025-03-28 20:52:58 +01:00
3 changed files with 58 additions and 45 deletions

View File

@@ -3,7 +3,7 @@ type: kubernetes
name: default
node_selector:
physical-node: dev2
physical-node: dev1
trigger:
event:

View File

@@ -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

View File

@@ -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"
@@ -542,13 +556,12 @@ upgrade() {
else
debug "$service_exec service-$NAME.json start info"
$service_exec service-$NAME.json stop force
$service_exec service-$NAME.json start info &
debug "$service_exec $NAME.json start info"
$service_exec $NAME.json stop force
$service_exec $NAME.json start info &
fi
}
execute_task() {
TASK="$1"
B64_JSON="$2"