Refactor deployment logic to stop service before editing in entrypoint script

scripts/scheduler/entrypoint.sh

@@ -111,8 +111,6 @@ create_htpasswd_file() {
     fi
 }
 
-install -m 664 -g 65534 /dev/null
-
 deploy_additionals() {
 
     local DIR="$1"
@@ -208,8 +206,22 @@ remove_additionals() {
         fi
     done
 
+    ENV_FILES=$(cat $SERVICE_DIR/service-$NAME.json | jq -r '[.containers[] | select(has("ENV_FILES")) | .ENV_FILES[]] | unique[]')
+    for ENV_FILE in $(echo $ENV_FILES); do
+        if [ -f "$ENV_FILE" ]; then
+            rm -rf $ENV_FILE
+            debug "deleted enviroment file: $ENV_FILE"
+        fi
+    done
+
     VOLUMES=$(cat $SERVICE_DIR/service-$NAME.json | jq -r '[.containers[] | select(has("VOLUMES")) | .VOLUMES[] | select(.SHARED != "true") | .SOURCE] | unique[]' | grep -vE 'USER|SYSTEM')
-    for VOLUME in $(echo $VOLUMES); do
+
+    # stop service
+    # force - remove stopped container, docker rm
+    debug "$service_exec service-$NAME.json stop force dns-remove"
+    $service_exec service-$NAME.json stop force dns-remove
+
+    for VOLUME in $(echo $VOLUMES | grep -vE 'USER|SYSTEM|SHARED'); do
         if [ "$(echo $VOLUME | cut -d '/' -f1)" ]; then
             docker volume rm $VOLUME
             debug "deleted volume: $VOLUME"
@@ -217,11 +229,6 @@ remove_additionals() {
         fi
     done
 
-    # stop service
-    # force - remove stopped container, docker rm
-    debug "$service_exec service-$NAME.json stop force dns-remove"
-    $service_exec service-$NAME.json stop force dns-remove
-
     # remove service files
     rm $SERVICE_DIR/*"-"$NAME.json # service, domain, etc.
 
@@ -796,12 +803,13 @@ execute_task() {
             for APP in $APPS; do
                 APP_NAME=$(echo "$APP" | jq -r '.name')
                 APP_VERSION=$(echo "$APP" | jq -r '.version')
+                APP_ICON=$(echo "$APP" | jq -r '.icon')
                 if [ "$DEPLOYMENTS" != "" ]; then
                     SEP=","
                 else
                     SEP=""
                 fi
-                DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": "'$APP_VERSION'"'
+                DEPLOYMENTS=$DEPLOYMENTS$SEP'"'$APP_NAME'": {"version": "'$APP_VERSION'", "icon": "'$APP_ICON'"}'
             done
         done
         if [ "$DEPLOYMENTS" == "" ]; then
@@ -891,6 +899,18 @@ execute_task() {
                         DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
                         deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD"
                         sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &
+
+                    elif [ "$DEPLOY_ACTION" == "edit" ]; then
+
+                        DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
+
+                        # stop service before edit
+                        debug "$service_exec service-$DEPLOY_NAME.json stop force"
+                        $service_exec service-$DEPLOY_NAME.json stop force
+
+                        deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD"
+                        sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &
+
                     elif [ "$DEPLOY_ACTION" == "uninstall" ]; then
                         remove_additionals "$APP_DIR" "$DEPLOY_NAME"
                         # uninstall has finished