Commit Graph

14 Commits

Author SHA1 Message Date
Tilo Spannagel
69b4a015ed
Fix permissions when running as root 2017-08-14 19:05:30 +02:00
Tobias Brunner
bd3fc10d7d
update directory permissions to be compatible with non-root
This commit updates the directory permissions to be more compatible when
running the image without root f.e. on OpenShift or when specifying it
when running with `docker run --user www-data:root ...`.
It adds detection logic to the entrypoint script as sudo is not always
allowed.

This change in directory permissions was also proposed by the official
documentation, see https://github.com/nextcloud/documentation/commit/22e2530.

The `chown` before the volume definition is needed to prepare the volume
as it inherits the permissions.

refs https://github.com/nextcloud/docker/issues/107
2017-08-14 19:05:25 +02:00
Tilo Spannagel
4d0972ed35
Ensure apps.config.php get only copied when upgrading from old version 2017-06-29 16:00:46 +02:00
Yuxiang Zhu
f47f9f9c99 Ensure config/apps.config.php get copied
PR #115 breaks the logic that config/apps.config.php get copied
after custom_apps: https://github.com/nextcloud/docker/pull/115#discussion_r124702790.

This patch is going to copy that file if it doesn't exist.
2017-06-29 11:36:15 +08:00
Yuxiang Zhu
8e8f33ef46 Copy config, data, custom_apps, and themes to volume when empty
When Nextcloud performs an upgrade or clean installation,
it will check whether /var/www/html/{config,data,custom_apps,themes} exist.
If not, it will copy
/usr/src/nextcloud/{config,data,custom_apps,themes} to /var/www/html.

This leads to a problem: If those subdirectories are existent but
empty, it will not do the copy. This situation is common when you mount
volumes to those subdirectories, like:

```
version: "2.1"
services:
    app:
        image: nextcloud:12-apache
        volumes:
            - nextcloud:/var/www/html:Z
            - nextcloud-custom_apps:/var/www/html/custom_apps:Z
            - nextcloud-config:/var/www/html/config:Z
            - nextcloud-data:/var/www/html/data:Z
            - nextcloud-themes:/var/www/html/themes:Z
        ports:
            - 8080:80/tcp
    db:
        image: mariadb
        volumes:
            - db:/var/lib/mysql:Z
        environment:
            MYSQL_USER: nextcloud
            MYSQL_DATABASE: nextcloud
            MYSQL_PASSWORD: nextcloud
            MYSQL_ROOT_PASSWORD: nextcloud

volumes:
    nextcloud:
    nextcloud-custom_apps:
    nextcloud-config:
    nextcloud-data:
    nextcloud-themes:
    db:
```

This patch will fix this issue by copying to those subdirectories when they
are empty.
2017-06-28 14:59:24 +08:00
Tilo Spannagel
749f25b93d
Don't overwrite themes 2017-05-23 21:12:06 +02:00
Tilo Spannagel
d253cc1171
strong permissions 2017-04-19 19:29:51 +02:00
Tilo Spannagel
201d934bb6
more specific downgrade message 2017-04-19 09:17:59 +02:00
Tilo Spannagel
fc384e6a7e
split app folder 2017-04-17 23:02:25 +02:00
Tilo Spannagel
ae5b15cca3
show disabled apps 2017-04-17 23:00:56 +02:00
Tilo Spannagel
87c651374e
run occ upgrade 2017-04-17 22:57:48 +02:00
Tilo Spannagel
055f5778e3
use rsync for upgrade 2017-04-17 22:53:39 +02:00
Tilo Spannagel
8f2bc6bec7
add version comparison 2017-04-17 22:49:53 +02:00
pierreozoux
8fa384bcd6 first commit 2016-07-30 15:30:52 +01:00