Wikijs repo fix (#2273)

Co-authored-by: nmfretz <nmfretz@gmail.com>

wikijs/docker-compose.yml

@@ -8,11 +8,10 @@ services:
       PROXY_AUTH_ADD: "false"
   
   server:
+    user: "1000:1000"
     image: linuxserver/wikijs:2.5.306@sha256:4868253594b2511b7c6054aa83695332bf3e77257b667c84e276e62668e36b62
     restart: on-failure
-    environment:
-      - PUID=1000
-      - PGID=1000
     volumes:
       - ${APP_DATA_DIR}/data:/data
-      - ${APP_DATA_DIR}/config:/config
+      - ${APP_DATA_DIR}/repo:/app/wiki/data/repo
+      - ${APP_DATA_DIR}/config:/config

wikijs/hooks/pre-start

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+APP_DATA_DIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)/data"
+APP_CONFIG_DIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)/config"
+APP_REPO_DIR="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)/repo"
+
+# Create repo directory if it does not exist. This was not included for pre-2.5.306-1 installs
+[ ! -d "${APP_REPO_DIR}" ] && mkdir -p "${APP_REPO_DIR}"
+
+# Recursively set ownership of all bind mounts to 1000:1000. wikijs was running as root for pre-2.5.306-1 installs
+# even though it was using "correct" PUID/PGID env vars for linuxserver.io images.
+chown -R 1000:1000 "${APP_DATA_DIR}"
+chown -R 1000:1000 "${APP_CONFIG_DIR}"
+chown -R 1000:1000 "${APP_REPO_DIR}"

wikijs/umbrel-app.yml

@@ -1,8 +1,8 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: wikijs
 category: developer
 name: WikiJS
-version: "2.5.306"
+version: "2.5.306-1"
 tagline: Make documentation a joy to write
 description: >-
   The most powerful and extensible open source Wiki software.
@@ -30,7 +30,10 @@ defaultUsername: ""
 defaultPassword: ""
 torOnly: false
 releaseNotes: >-
-  This update includes the following changes:
+  This update includes a bug fix that prevented access to the repo folder for syncing with git.
+
+
+  Version 2.5.306 includes the following changes:
     - Added a git always namespace option
     - Fixed an issue with HA mode activation
     - Improved compatibility with Elasticsearch
@@ -38,4 +41,4 @@ releaseNotes: >-
 
   Full release notes are found at https://github.com/requarks/wiki/releases
 submitter: Pranshu Agrawal
-submission: https://github.com/getumbrel/umbrel-apps/pull/273
+submission: https://github.com/getumbrel/umbrel-apps/pull/273