Commit Graph

246 Commits

Author SHA1 Message Date
Marc Brückner
0061b638cc Merge pull request #118 from vfreex/fix-115
Ensure config/apps.config.php get copied
2017-06-29 08:37:58 +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
Tilo Spannagel
d1dd0fb007 Merge pull request #117 from tilosp-docker/memcached-3.0.3
Update memcached to version 3.0.3
2017-06-28 14:27:02 +02:00
Tilo Spannagel
72425854ac
Update memcached to version 3.0.3 2017-06-28 14:08:05 +02:00
Tilo Spannagel
ba45637af1 Merge pull request #116 from tilosp-docker/redis-3.1.2
Update redis to version 3.1.2
2017-06-28 14:01:41 +02:00
Tilo Spannagel
e144ba4787
Update redis to version 3.1.2 2017-06-28 13:36:10 +02:00
Tilo Spannagel
16a36a4f9a Merge pull request #115 from vfreex/fix-subdir-copy
Copy config, data, custom_apps, and themes to volume when empty
2017-06-28 13:20:28 +02: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
Marc Brückner
af7965154e Merge pull request #112 from jakommo/jakommo-fpm-example-1
Update README.md to use nextcloud:fpm image in FPM example
2017-06-25 15:55:13 +02:00
Jakob Reiter
6addbfaeb8 Update README.md
Fixed FPM example docker-compose to actually use nextcloud:fpm image instead of the default apache one
2017-06-25 13:10:28 +02:00
Tilo Spannagel
a0ad7ac1c7 Merge pull request #111 from tilosp-docker/travis-build-stages
Use travis build stages
2017-06-23 21:32:20 +02:00
Tilo Spannagel
e5d81338d9
Use travis build stages 2017-06-23 18:59:00 +02:00
Tilo Spannagel
2ed2ea4a28 Merge pull request #110 from tilosp-docker/nextcloud-9-cleanup
Nextcloud 9 cleanup
2017-06-21 18:05:47 +02:00
Tilo Spannagel
ebda756330
Nextcloud 9 cleanup 2017-06-21 17:51:36 +02:00
Tilo Spannagel
2cfcc267fa Merge pull request #106 from tilosp-docker/fix-typos
Fix Typos
2017-06-19 08:49:46 +02:00
Tilo Spannagel
52e66c507d
Fix Typos 2017-06-18 09:00:53 +02:00
Josh
e863eed1a0 Fix README.md typo (#101)
* Fix README.md typo

* Update README.md
2017-06-13 10:07:31 +02:00
Tilo Spannagel
24a190e581 Merge pull request #99 from nextcloud/remove-end-of-life
Remove end of life versions (9.0)
2017-06-12 12:54:59 +02:00
Tilo Spannagel
86c40037bf
Remove end of life versions 2017-06-10 23:15:11 +02:00
Tilo Spannagel
9b815390c8 Merge pull request #96 from nextcloud/default-port
Improve README with the default host port
2017-06-10 23:03:55 +02:00
Pierre Ozoux
d8d130a258 Improve README with the default host port 2017-06-10 11:25:44 +01:00
Pierre Ozoux
d022c79bea Merge pull request #93 from tilosp-docker/recommended-opcache
Use the recommended opcache settings
2017-06-10 10:59:48 +01:00
Tilo Spannagel
72ef7897e6
Recommended opcache settings 2017-06-09 13:31:43 +02:00
Tilo Spannagel
d365e45c02 Use the downloads index to get the latest version 2017-06-06 15:41:57 +02:00
Tilo Spannagel
aa40fa7a75 Merge pull request #85 from tilosp-docker/get-version
Use the downloads index to get the version numbers
2017-06-06 13:02:25 +02:00
Tilo Spannagel
8198762ec5
Use the downloads index to get the version numbers 2017-06-03 14:52:41 +02:00
Tilo Spannagel
31c6487e4f Merge pull request #79 from tilosp-docker/exclude-themes
Don't overwrite themes
2017-06-03 14:13:22 +02:00
Tilo Spannagel
29cfadb778 Merge pull request #83 from ColorizedMind/master
Fixed README.md
2017-06-02 12:57:17 +02:00
Henning
1f6bcd88be Fixed typo 2017-06-02 07:46:06 +02:00
Henning
eecb594bb0 Fixed environment variables for MariaDB 2017-06-02 07:45:11 +02:00
Tilo Spannagel
fae8b66621 Merge pull request #82 from gauravarora/patch-1
Update README.md
2017-06-01 11:23:57 +02:00
Gaurav Arora
76d60f2ee2 Update README.md
volumes_from instead of volumes-from in docker-compose.yml
2017-06-01 13:44:14 +05:30
Marc Brückner
f8a4572935 Rework Readme file (#53)
* Rework Readme file

* Fixed db-folder paths

* Typos

* Fixed Typos

* Fix typo

* Use pull to correctly pull a newer base image

* Moved heading to the top

* Clarify serving of static files in the fpm container

* Update Persistant data

* Added theming.
* Added information on apps and custom_apps folder.

* Typos, clarification

* Added migration part

* Fix wrong use of --pull

* Reordering, spelling, clarification

* Specified volumes section

* Corrected examples

* Added /var/www/html to the fine grained volume approach

Also added a line on upgrading.

* Typos in migration section

* Updated SSL-encryption, Typos, removed "..."

* Typos and some layout improvements

* Typo, typo, typo :D

* Added hint to set passwords

* added links for external containers in ssl example
2017-05-24 06:18:36 +02:00
Tilo Spannagel
749f25b93d
Don't overwrite themes 2017-05-23 21:12:06 +02:00
Tianon Gravi
20694c47e7 Make sure "generate-stackbrew-library.sh" fails if there's some kind of network error (and thus "$latest" cannot be determined properly) 2017-04-26 13:14:40 -07:00
Tilo Spannagel
71199bd69a Merge pull request #65 from nextcloud/volume
Rework Updating
2017-04-24 20:58:41 +02:00
Docker Library Bot
2bb94165af Update to 10.0.5 2017-04-24 08:51:11 -07:00
Docker Library Bot
6c9dd84424 Update to 11.0.3 2017-04-24 08:51:10 -07:00
Docker Library Bot
c178ab0a8a Update to 9.0.58 2017-04-24 08:51:10 -07: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
07a10828d6
disable the updater 2017-04-18 09:05:53 +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
Tilo Spannagel
db148abc5a Merge pull request #61 from tilosp-docker/test-sh
Added Tests for shell scripts
2017-04-01 19:01:09 +02:00
Tilo Spannagel
efbe7b56e3
Added Tests for shell scripts 2017-04-01 18:23:50 +02:00
Tilo Spannagel
74effa74c7 Added Travis build status badge 2017-03-26 18:09:27 +02:00