Merge pull request #393 from Cilenco/fix/rootless-docker-run
This commit is contained in:
+6
-2
@@ -10,14 +10,18 @@ STORAGE_DIR="/app/storage"
|
|||||||
STATIC_DIR="/app/static"
|
STATIC_DIR="/app/static"
|
||||||
|
|
||||||
# Ensure the storage directory exists and is writable by oxicloud
|
# Ensure the storage directory exists and is writable by oxicloud
|
||||||
if [ -d "$STORAGE_DIR" ]; then
|
if [ -d "$STORAGE_DIR" ] && [ "$(id -u)" -eq 0 ]; then
|
||||||
chown -R oxicloud:oxicloud "$STORAGE_DIR"
|
chown -R oxicloud:oxicloud "$STORAGE_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure static directory is readable
|
# Ensure static directory is readable
|
||||||
if [ -d "$STATIC_DIR" ]; then
|
if [ -d "$STATIC_DIR" ] && [ "$(id -u)" -eq 0 ]; then
|
||||||
chown -R oxicloud:oxicloud "$STATIC_DIR"
|
chown -R oxicloud:oxicloud "$STATIC_DIR"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Drop privileges and exec the main binary (or whatever was passed as CMD)
|
# Drop privileges and exec the main binary (or whatever was passed as CMD)
|
||||||
|
if [ "$(id -u)" -eq 0 ]; then
|
||||||
exec su-exec oxicloud "$@"
|
exec su-exec oxicloud "$@"
|
||||||
|
else
|
||||||
|
oxicloud "$@"
|
||||||
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user