Update scripts/scheduler/entrypoint.sh

.drone.yml

@@ -3,34 +3,17 @@ type: kubernetes
 name: default
 
 node_selector:
-  physical-node: dev2
+  physical-node: dev1
 
 trigger:
-  branch:
-    - main
   event:
     - push
+    - tag
+
 workspace:
   path: /drone/src
 
 steps:
-  - name: build multiarch from dev
-    image: docker.io/owncloudci/drone-docker-buildx:4
-    privileged: true
-    settings:
-      cache-from: [ "registry.dev.format.hu/framework-scheduler" ]
-      registry: registry.dev.format.hu
-      repo: registry.dev.format.hu/framework-scheduler
-      tags: latest
-      dockerfile: Dockerfile
-      username:
-        from_secret: dev-hu-registry-username
-      password: 
-        from_secret: dev-hu-registry-password
-      platforms:
-        - linux/amd64
-        - linux/arm64
-
   - name: pull image to dockerhub
     image: docker.io/owncloudci/drone-docker-buildx:4
     privileged: true
@@ -44,4 +27,29 @@ steps:
         from_secret: dockerhub-password
       platforms:
         - linux/amd64
-        - linux/arm64
+        - linux/arm64
+    when:  
+      event:
+        - tag
+
+  - name: build multiarch from dev
+    image: docker.io/owncloudci/drone-docker-buildx:4
+    privileged: true
+    #environment:
+    #  DOCKER_PLUGIN_MIRROR: "https://mirror.dev.format.hu"
+    settings:
+      cache-from: [ "registry.dev.format.hu/framework-scheduler" ]
+      registry: registry.dev.format.hu
+      repo: registry.dev.format.hu/framework-scheduler
+      tags: latest
+      dockerfile: Dockerfile
+      username:
+        from_secret: dev-hu-registry-username
+      password: 
+        from_secret: dev-hu-registry-password
+      platforms:
+        - linux/amd64
+        - linux/arm64
+    when:  
+      event:
+        - push

Dockerfile

@@ -14,10 +14,10 @@ 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
 RUN ["chmod", "+x", "-R", "/scripts/"]
 
-ENTRYPOINT ["/scripts/entrypoint.sh"]
+CMD /scripts/entrypoint.sh

README.md

@@ -1,2 +1,3 @@
 # platform-scheduler
 
+

scripts/scheduler/backup_challenge_clients.sh

@@ -0,0 +1,89 @@
+# Get MY IP
+
+# Get VPN network if exists
+
+# Define port
+
+# Define local IP range
+
+# Define VPN IP range
+
+# Store results
+
+
+scan_network(){
+        MyIP=$(ifconfig ${Interface}|grep inet |awk '{ print $2 }');
+        TargetIP=$(echo $MyIP|cut -d . -f1-3);
+        X=0
+	OpenIP=""
+        for i in $(seq 1 255); do
+                nc -w 1 -z $TargetIP.$i 60022;
+                if [ $? -eq 0 ]
+                then
+			if [ $MyIP != $TargetIP.$i ]
+                        then
+                                if [ $X = 1 ]
+                                then
+                                        # tobb nyitott IP
+					echo "Found more than one IP addresses"
+                                        echo "MAILKULDES"
+					echo "">OpenIP.txt;
+					# TODO mailkuldes ahova kell
+					exit 1;
+				else
+					OpenIP=$TargetIP.$i;
+                                fi
+				X=1;
+                        fi
+                fi
+	done
+	if [ $X = 1  ]
+	then
+		echo $OpenIP>OpenIP.txt;
+		echo "start LVM SYNC";
+		echo "OpenIP mukodik = "$OpenIP;
+		lvm_sync_create $OpenIP;
+	else
+		echo "No available local IP address found!"
+		try_target_VPN;
+	fi
+
+
+}
+
+try_target_IP(){
+	MyIP=$(ifconfig ${Interface}|grep inet |awk '{ print $2 }');
+ 	nc -w 1 -z $OpenIP 60022;
+        if [ $? -eq 0 ] 
+                then
+			if [ $MyIP = $OpenIP ]
+				then	
+				echo "Only own IP address found = "$OpenIP
+				scan_network;
+			fi
+	else
+	scan_network;
+	fi
+}
+
+try_target_VPN(){
+	nc -w 1 -z $VPN 60022;
+        if [ $? -eq 0 ]
+		then
+		for i in {0..99}; do
+		MyVPN=$(ifconfig tun$i 2>/dev/null |grep inet |awk '{ print $2 }');
+			echo "My VPN="$MyVPN;
+			echo "Found VPN="$VPN;
+			if [ $VPN != $MyVPN ]
+				then
+				echo "VPN accessible="$VPN;
+				lvm_sync_create $VPN;
+					else
+					echo "Only own VPN accessible="$VPN;
+					exit 1;
+			fi
+		done
+		else
+		echo "No available server"
+	fi
+}

scripts/scheduler/install.sh

@@ -4,6 +4,31 @@ SERVICE_EXEC=$2
 FIRST_INSTALL=$3
 GLOBAL_VERSION=$4
 
+edit_user_json() {
+
+    if [ ! -f /etc/user/config/user.json ]; then
+        install -m 664 -g 65534 /dev/null /etc/user/config/user.json
+        echo '{}' >/etc/user/config/user.json
+
+    else
+        if [ -z $(cat /etc/user/config/user.json) ]; then
+            echo '{}' >/etc/user/config/user.json
+        fi
+    fi
+
+    TMP_FILE=$(mktemp)
+    jq '
+      if . == null or . == [] then 
+        {"letsencrypt": { "EMAIL": "'$LETSENCRYPT_MAIL'", "LETSENCRYPT_SERVER": "'$LETSENCRYPT_SERVERNAME'" }}
+      else 
+        . + {"letsencrypt": { "EMAIL": "'$LETSENCRYPT_MAIL'", "LETSENCRYPT_SERVER": "'$LETSENCRYPT_SERVERNAME'" }}
+      end
+    ' /etc/user/config/user.json >$TMP_FILE
+    cat $TMP_FILE >/etc/user/config/user.json
+    rm $TMP_FILE
+
+}
+
 get_vpn_key() {
 
     if [ "$VPN_PASS" != "" ]; then
@@ -175,11 +200,18 @@ elif [ "$FIRST_INSTALL" == "vpn" ]; then
 
     get_vpn_key
 
-    $SERVICE_EXEC vpn-proxy start
-    echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$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
+    if [ "$VPN_PROXY" != "no" ]; then
+
+	    edit_user_json $LETSENCRYPT_MAIL $LETSENCRYPT_SERVERNAME
+
+	    $SERVICE_EXEC vpn-proxy stop force
+	    $SERVICE_EXEC vpn-proxy start
+	    echo "$INIT_SERVICE_PATH/vpn-proxy.json" >>$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
 

scripts/scheduler/upgrade.sh

@@ -1,9 +1,85 @@
 #!/bin/sh
 
-B64_JSON=$1
-SERVICE_EXEC=$2
-GLOBAL_VERSION=$4
+#! /bin/sh
 
-for SERVICE in $(echo $B64_JSON | base64 -d | jq -r 'keys[]'); do
+cd /scripts
+DEBUG_MODE=${DEBUG_MODE:-false}
 
-done
+DATE=$(date +%F-%H-%M-%S)
+
+#DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-registry.format.hu}
+DOCKER_REGISTRY_URL=${DOCKER_REGISTRY_URL:-safebox}
+USER_INIT_PATH=$USER_INIT_PATH
+GLOBAL_VERSION=${GLOBAL_VERSION:-latest}
+SERVICE_DIR=${SERVICE_DIR:-/etc/user/config/services}
+SECRET_DIR=${SECRET_DIR:-/etc/user/secret}
+
+SHARED=${SHARED:-/var/tmp/shared}
+
+FRAMEWORK_SCHEDULER_IMAGE=${FRAMEWORK_SCHEDULER_IMAGE:-framework-scheduler}
+FRAMEWORK_SCHEDULER_NAME=${FRAMEWORK_SCHEDULER_NAME:-framework-scheduler}
+FRAMEWORK_SCHEDULER_NETWORK=${FRAMEWORK_SCHEDULER_NETWORK:-framework-network}
+FRAMEWORK_SCHEDULER_NETWORK_SUBNET=${FRAMEWORK_SCHEDULER_NETWORK_SUBNET:-"172.19.255.0/24"}
+FRAMEWORK_SCHEDULER_VERSION=${FRAMEWORK_SCHEDULER_VERSION:-latest}
+RUN_FORCE=${RUN_FORCE:-false}
+
+WEB_SERVER=${WEB_SERVER:-webserver}
+WEB_IMAGE=${WEB_IMAGE:-web-installer}
+WEBSERVER_PORT=${WEBSERVER_PORT:-8080}
+WEBSERVER_VERSION=${WEBSERVER_VERSION:-latest}
+
+if [[ -n "$DOCKER_REGISTRY_URL" && "$DOCKER_REGISTRY_URL" != "null" ]]; then
+    SETUP="/setup"
+else
+    SETUP="setup"
+    DOCKER_REGISTRY_URL=""
+fi
+
+SETUP_VERSION=${SETUP_VERSION:-$GLOBAL_VERSION}
+
+# $DNS_PATH \
+#$CA_FILE \
+DNS_DIR="/etc/system/data/dns"
+DNS="--env DNS_DIR=$DNS_DIR"
+DNS_PATH="--volume $DNS_DIR:/etc/system/data/dns:rw"
+HOST_FILE=$DNS_DIR"/hosts.local"
+mkdir -p $DNS_DIR
+touch $HOST_FILE
+
+mkdir -p /etc/system/data/ssl/certs
+mkdir -p /etc/system/data/ssl/keys
+
+CA_PATH=/etc/system/data/ssl/certs
+CA="--env CA_PATH=$CA_PATH"
+CA_FILE="--volume $CA_PATH:$CA_PATH:ro"
+mkdir -p $CA_PATH
+
+VOLUME_MOUNTS="-v SYSTEM_DATA:/etc/system/data -v SYSTEM_CONFIG:/etc/system/config -v SYSTEM_LOG:/etc/system/log -v USER_DATA:/etc/user/data -v USER_CONFIG:/etc/user/config -v USER_SECRET:/etc/user/secret"
+
+service_exec="/usr/bin/docker run --rm \
+$DNS \
+$CA \
+-w /etc/user/config/services/ \
+$VOLUME_MOUNTS \
+-v /var/run/docker.sock:/var/run/docker.sock \
+--env VOLUME_MOUNTS="$(echo $VOLUME_MOUNTS | base64 -w0)" \
+--env DOCKER_REGISTRY_URL=$DOCKER_REGISTRY_URL \
+--env SETUP_VERSION=$SETUP_VERSION \
+--env GLOBAL_VERSION=$GLOBAL_VERSION \
+--env HOST_FILE=$HOST_FILE \
+$DOCKER_REGISTRY_URL$SETUP:$SETUP_VERSION"
+
+SHARED=${SHARED:-/var/tmp/shared}
+TASK="scheduler-upgrade"
+
+JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "UPGRADE_STATUS": "0" }' | jq -r . | base64 -w0) # install has started
+install -m 664 -g 65534 /dev/null $SHARED/output/$TASK.json
+echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
+
+/usr/bin/docker rm -f framework-scheduler
+$service_exec service-framework.containers.framework-scheduler start
+
+JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "UPGRADE_STATUS": "1" }' | jq -r . | base64 -w0)
+echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
+
+/usr/bin/docker rm -f $HOSTNAME