Restore AppFactory scripts to stable versions

scripts/deploy-app.sh

@@ -4,19 +4,12 @@ set -euo pipefail
 APP_ID="${1:-}"
 
 if [ -z "$APP_ID" ]; then
-  echo "Usage:"
-  echo "  ./deploy-app.sh <app-id>"
+  echo "Usage: ./deploy-app.sh <app-id>"
   exit 1
 fi
 
 CONFIG_FILE="/opt/appfactory/config/appfactory.env"
-
-if [ -f "$CONFIG_FILE" ]; then
-  source "$CONFIG_FILE"
-fi
-
-APPFACTORY_DIR="${APPFACTORY_DIR:-/opt/appfactory}"
-WORKSPACE_DIR="${WORKSPACE_DIR:-/home/jiri/workspace}"
+source "$CONFIG_FILE"
 
 APP_SOURCE_DIR="$WORKSPACE_DIR/$APP_ID"
 CATALOG_FILE="$APPFACTORY_DIR/apps/catalog.yml"
@@ -32,14 +25,15 @@ if [ ! -f "$APP_SOURCE_DIR/Dockerfile" ]; then
   exit 1
 fi
 
+chown -R "$APP_USER:$APP_GROUP" "$APP_SOURCE_DIR" || true
+
 echo "Updating source code..."
 cd "$APP_SOURCE_DIR"
 
 if [ -d ".git" ]; then
+  git config --global --add safe.directory "$APP_SOURCE_DIR" || true
   git fetch origin main
   git reset --hard origin/main
-else
-  echo "WARNING: $APP_SOURCE_DIR is not a git repository"
 fi
 
 echo "Building Docker image..."
@@ -63,7 +57,7 @@ cat >> "$CATALOG_FILE" <<EOF_APP
 EOF_APP
 fi
 
-echo "Regenerating compose, Caddyfile and apps page..."
+echo "Regenerating generated files..."
 
 "$TOOLS_DIR/scripts/generate-apps-compose.sh"
 "$TOOLS_DIR/scripts/generate-caddyfile.sh"
@@ -77,4 +71,4 @@ docker compose -f docker-compose.yml -f apps-compose.yml up -d --force-recreate
 echo ""
 echo "DONE"
 echo "Open:"
-echo "${APPFACTORY_PUBLIC_URL:-http://192.168.66.130}/apps/$APP_ID/docs"
+echo "$APPFACTORY_PUBLIC_URL/apps/$APP_ID/docs"