From 91e9495148378ccb2766a63c1e8191d6787fab02 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas.k@gmail.com>
Date: Wed, 22 Jan 2020 19:22:30 +0100
Subject: [PATCH] docker: check "/app/gogs" separately on startup (#5895)

When running gogs after the first time, if the image has changed (update
rebuild), the /app/gogs directory will have changed owner back to
root:root, but /data will likely not be since the data directories are
likely to be persistent.

Checking /app/gogs separately fixes this.
---
 docker/s6/gogs/setup | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker/s6/gogs/setup b/docker/s6/gogs/setup
index 7d4358b39..8a95422ae 100755
--- a/docker/s6/gogs/setup
+++ b/docker/s6/gogs/setup
@@ -21,6 +21,13 @@ ln -sfn /data/git /home/git
 
 # Only chown for the first time, owner of '/data' is 'git' inside Docker after installation
 if [ $(stat -c '%U' /data) != 'git' ]; then
-	chown -R git:git /data /app/gogs ~git/
+    chown -R git:git /data ~git/
 fi
+
+# Check ownership of '/app/gogs' in case the image changed and '/data' is persistent
+if [ $(stat -c '%U' /app/gogs) != 'git' ]; then
+    chown -R git:git /app/gogs
+fi
+
+
 chmod 0755 /data /data/gogs ~git/