marceljd
65f2427fc0
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
b13c578db0
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
aeff968a80
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
b9e5b19a37
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
a2515d42f6
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
d74de273e8
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
0924211326
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
21e5421e75
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
77d44c58bc
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
e97df421f1
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
8b4dc27b1c
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
c84311c392
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
7ee81943c8
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
3bee4c0fe0
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
eaaf4853cf
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
00b8fd74b2
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
61dee2708e
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
dce4d20fa7
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
47fb5c336f
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
7594ff380a
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/Dockerfile
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/Dockerfile
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/Dockerfile
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/Dockerfile
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/Dockerfile
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/Dockerfile
modified: 15.0/fpm/entrypoint.sh
modified: Dockerfile-debian.template
modified: docker-entrypoint.sh
Untracked files:
.config/000-default.conf
13.0/apache/config/000-default.conf
13.0/fpm-alpine/config/000-default.conf
13.0/fpm/config/000-default.conf
14.0/apache/config/000-default.conf
14.0/fpm-alpine/config/000-default.conf
14.0/fpm/config/000-default.conf
15.0/apache/config/000-default.conf
15.0/fpm-alpine/config/000-default.conf
15.0/fpm/config/000-default.conf
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
fb9aa3255f
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Untracked files:
.config/000-default.conf
13.0/apache/config/000-default.conf
13.0/fpm-alpine/config/000-default.conf
13.0/fpm/config/000-default.conf
14.0/apache/config/000-default.conf
14.0/fpm-alpine/config/000-default.conf
14.0/fpm/config/000-default.conf
15.0/apache/config/000-default.conf
15.0/fpm-alpine/config/000-default.conf
15.0/fpm/config/000-default.conf
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
7d85a64207
On branch apache-ssl
...
Changes to be committed:
modified: 13.0/apache/entrypoint.sh
modified: 13.0/fpm-alpine/entrypoint.sh
modified: 13.0/fpm/entrypoint.sh
modified: 14.0/apache/entrypoint.sh
modified: 14.0/fpm-alpine/entrypoint.sh
modified: 14.0/fpm/entrypoint.sh
modified: 15.0/apache/entrypoint.sh
modified: 15.0/fpm-alpine/entrypoint.sh
modified: 15.0/fpm/entrypoint.sh
modified: docker-entrypoint.sh
Untracked files:
.config/000-default.conf
13.0/apache/config/000-default.conf
13.0/fpm-alpine/config/000-default.conf
13.0/fpm/config/000-default.conf
14.0/apache/config/000-default.conf
14.0/fpm-alpine/config/000-default.conf
14.0/fpm/config/000-default.conf
15.0/apache/config/000-default.conf
15.0/fpm-alpine/config/000-default.conf
15.0/fpm/config/000-default.conf
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
76ca17dfb2
On branch apache-ssl
...
Changes to be committed:
modified: docker-entrypoint.sh
Untracked files:
.config/000-default.conf
Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
Richard Steinmetz
8bd688664d
Fix typo in docker-entrypoint.sh
...
Signed-off-by: Richard Steinmetz <steinmetz.richard@googlemail.com>
2018-12-12 19:24:24 +01:00
Tilo Spannagel
424364e2e1
Merge pull request #515 from SnowMB/add_update_variable
...
Add NEXTCLOUD_UPDATE for containers started with non-default commands
2018-10-16 18:30:39 +02:00
Arthur Schiwon
3f931009c5
add a mechanism to set trusted domains on install
2018-10-15 15:29:32 +02:00
Marc Brückner
63710a75a3
added new environment variable
2018-10-15 15:01:39 +02:00
Tilo Spannagel
91adc66fae
Merge pull request #480 from SnowMB/fix_sleeps
...
added retry loop and decreased sleep time
2018-10-03 17:56:15 +02:00
Marc Brückner
6eb8f3fa16
added retry loop and decreased sleep time
2018-10-02 10:45:00 +02:00
Tilo Spannagel
a46493fbc4
Use exclude file for the updater
...
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2018-10-01 22:31:34 +02:00
Marc Bihlmaier
efe4edb8eb
echo to stdout when migration-script is running ( #333 )
...
* echo to stdout when migration-script is running
* specifying output
* output Initializing new instance
* simplify output
2018-09-29 20:15:08 +02:00
Tilo Spannagel
6b10932e81
Ignore shellcheck errors
...
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2018-09-27 13:04:47 +02:00
Marc Brückner
dbadf5520b
fixed expansion of environment variables
2018-09-27 09:58:47 +02:00
Marc Brückner
bdc2d3e610
fix regex for apache
2018-09-14 08:25:49 +02:00
Marc Brückner
a3cce50b00
only initialize / update when the command is apache* or php-fpm (do nothing on thins like bash, echo)
2018-09-13 14:36:50 +02:00
Marc Brückner
f5d3234fca
- using defaults from autoconfig.php
...
- using '-n' instead of '! -z'
- adding quotes
2018-09-13 11:32:56 +02:00
Marc Brückner
7f485eb9fa
implement #455 : auto-install via occ maintenance:install
2018-09-12 14:32:05 +02:00
Louis Matthijssen
f6abe4472b
Fix small typo in upgrade script
2018-09-09 14:25:54 +02:00
Tilo Spannagel
677134a7f9
Remove the "--no-app-disable" option form the "occ upgrade" command
...
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2018-08-16 18:07:28 +02:00
Tilo Spannagel
5d79969947
Fix indentation
2018-08-01 23:19:53 +02:00
Tilo Spannagel
db233e28be
Make docker-entrypoint.sh posix compliant
2018-03-15 17:40:37 +01:00
Tilo Spannagel
d104e1cba0
Add images for Release Candidates
2018-03-13 11:15:27 +01:00
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