Fix webhook deploy git ownership handling
This commit is contained in:
+11
-19
@@ -15,17 +15,6 @@ APP_SOURCE_DIR="$WORKSPACE_DIR/$APP_ID"
|
|||||||
CATALOG_FILE="$APPFACTORY_DIR/apps/catalog.yml"
|
CATALOG_FILE="$APPFACTORY_DIR/apps/catalog.yml"
|
||||||
TOOLS_DIR="$WORKSPACE_DIR/appfactory-tools"
|
TOOLS_DIR="$WORKSPACE_DIR/appfactory-tools"
|
||||||
|
|
||||||
safe_chown() {
|
|
||||||
local target="$1"
|
|
||||||
local uid
|
|
||||||
local gid
|
|
||||||
|
|
||||||
uid="${APP_UID:-$(stat -c '%u' "$WORKSPACE_DIR")}"
|
|
||||||
gid="${APP_GID:-$(stat -c '%g' "$WORKSPACE_DIR")}"
|
|
||||||
|
|
||||||
chown -R "$uid:$gid" "$target" || true
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ ! -d "$APP_SOURCE_DIR" ]; then
|
if [ ! -d "$APP_SOURCE_DIR" ]; then
|
||||||
echo "Missing app source: $APP_SOURCE_DIR"
|
echo "Missing app source: $APP_SOURCE_DIR"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -36,15 +25,17 @@ if [ ! -f "$APP_SOURCE_DIR/Dockerfile" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
safe_chown "$APP_SOURCE_DIR"
|
|
||||||
|
|
||||||
echo "Updating source code..."
|
echo "Updating source code..."
|
||||||
cd "$APP_SOURCE_DIR"
|
cd "$APP_SOURCE_DIR"
|
||||||
|
|
||||||
if [ -d ".git" ]; then
|
if [ -d ".git" ]; then
|
||||||
git config --global --add safe.directory "$APP_SOURCE_DIR" || true
|
git \
|
||||||
git fetch origin main
|
-c safe.directory="$APP_SOURCE_DIR" \
|
||||||
git reset --hard origin/main
|
fetch origin main
|
||||||
|
|
||||||
|
git \
|
||||||
|
-c safe.directory="$APP_SOURCE_DIR" \
|
||||||
|
reset --hard origin/main
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Building Docker image..."
|
echo "Building Docker image..."
|
||||||
@@ -77,9 +68,10 @@ echo "Regenerating generated files..."
|
|||||||
echo "Starting app container..."
|
echo "Starting app container..."
|
||||||
cd "$APPFACTORY_DIR/deploy"
|
cd "$APPFACTORY_DIR/deploy"
|
||||||
|
|
||||||
docker compose -f docker-compose.yml -f apps-compose.yml up -d --force-recreate "$APP_ID"
|
docker compose \
|
||||||
|
-f docker-compose.yml \
|
||||||
safe_chown "$APP_SOURCE_DIR"
|
-f apps-compose.yml \
|
||||||
|
up -d --force-recreate "$APP_ID"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "DONE"
|
echo "DONE"
|
||||||
|
|||||||
Reference in New Issue
Block a user