0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 02:45:09 +01:00
Commit graph

578 commits

Author SHA1 Message Date
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
4b8423141f On branch apache-ssl
Changes to be committed:
	modified:   .config/000-default.conf
	modified:   13.0/apache/config/000-default.conf
	modified:   13.0/fpm-alpine/config/000-default.conf
	modified:   13.0/fpm/config/000-default.conf
	modified:   14.0/apache/config/000-default.conf
	modified:   14.0/fpm-alpine/config/000-default.conf
	modified:   14.0/fpm/config/000-default.conf
	modified:   15.0/apache/config/000-default.conf
	modified:   15.0/fpm-alpine/config/000-default.conf
	modified:   15.0/fpm/config/000-default.conf

Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
c451b0bb12 On branch apache-ssl
Changes to be committed:
	new file:   .config/000-default.conf
	new file:   13.0/apache/config/000-default.conf
	new file:   13.0/fpm-alpine/config/000-default.conf
	new file:   13.0/fpm/config/000-default.conf
	new file:   14.0/apache/config/000-default.conf
	new file:   14.0/fpm-alpine/config/000-default.conf
	new file:   14.0/fpm/config/000-default.conf
	new file:   15.0/apache/config/000-default.conf
	new file:   15.0/fpm-alpine/config/000-default.conf
	new file:   15.0/fpm/config/000-default.conf

Signed-off-by: marceljd <support@dihosting.ch>
2019-02-09 15:37:17 +00:00
marceljd
6b0618e764 On branch apache-ssl
Changes to be committed:
	modified:   13.0/apache/Dockerfile
	modified:   13.0/fpm/Dockerfile
	modified:   14.0/apache/Dockerfile
	modified:   14.0/fpm/Dockerfile
	modified:   15.0/apache/Dockerfile
	modified:   15.0/fpm/Dockerfile
	modified:   Dockerfile-debian.template

 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
9d6413f954 On branch apache-ssl
Changes to be committed:
	modified:   13.0/apache/Dockerfile
	modified:   13.0/fpm/Dockerfile
	modified:   14.0/apache/Dockerfile
	modified:   14.0/fpm/Dockerfile
	modified:   15.0/apache/Dockerfile
	modified:   15.0/fpm/Dockerfile
	modified:   Dockerfile-debian.template

 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
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
5f5274d5b3 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
 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
Tilo Spannagel
4c0d269740
Revert "Update to 15.0.0beta2"
This reverts commit 2e8205eef4.
2019-02-08 22:29:34 +01:00
J0WI
ae94e4a349
Merge pull request #640 from J0WI/alpine-3.9
Update to Alpine 3.9
2019-02-08 18:13:13 +01:00
Docker Library Bot
2e8205eef4 Update to 15.0.0beta2 2019-02-08 10:53:12 +00:00
Tilo Spannagel
b5f659e6bd
Merge pull request #641 from nextcloud/update-release-channel
Update release channels
2019-02-07 22:04:10 +01:00
Tilo Spannagel
34a9a543e1
Merge pull request #639 from nextcloud/fix-examples
Remove app dockerfile
2019-02-07 22:00:07 +01:00
Tilo Spannagel
be19f23e61
Ship 15.0.4 on stable channel
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-02-07 13:21:16 +01:00
Tilo Spannagel
f4929e6067
Ship 14.0.7 on production channel
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-02-07 13:19:54 +01:00
Tilo Spannagel
cc0564ed40
Remove app dockerfile
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-02-07 13:06:04 +01:00
J0WI
0a3d4aef87 Update to Alpine 3.9
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2019-02-07 12:49:25 +01:00
Tilo Spannagel
b9ae3256ad
Merge pull request #600 from marceljd/redis-env-vars
Set Redis through environment variables
2019-02-07 12:20:53 +01:00
Tilo Spannagel
6d7be410e0
Update to 15.0.4
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-02-07 12:17:57 +01:00
Tilo Spannagel
2695fd9ba2
Run update.sh
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-02-07 12:09:11 +01:00
Docker Library Bot
6b8820f3f5 Update to 15.0.3 2019-02-07 04:51:23 +00:00
Docker Library Bot
cd72548651 Update to 13.0.11 2019-02-07 04:51:23 +00:00
Docker Library Bot
da1192ed4c Update to 14.0.7 2019-02-07 04:51:23 +00:00
J0WI
f2397fafc6
Merge pull request #634 from J0WI/594
Fix #594: svg support for imagick on Debian
2019-02-06 14:17:03 +01:00
J0WI
b0a5548d19
Merge pull request #638 from jaydrogers/patch-2
Simple typo fix
2019-02-05 12:49:32 +01:00
Jay Rogers
a726f805e3 Simple typo fix
Signed-off-by: Jay Rogers <jay@521dimensions.com>
2019-02-04 22:24:05 -06:00
J0WI
bb10546327 Add SVG support in full example
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2019-02-01 21:08:33 +01:00
Tilo Spannagel
184d54a2d6
Run update.sh
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-01-31 12:54:43 +01:00
Docker Library Bot
e298a56eaa Update to 13.0.11RC1 2019-01-31 10:51:39 +00:00
Docker Library Bot
a8a7cb9571 Update to 15.0.3RC1 2019-01-31 10:51:39 +00:00
Docker Library Bot
f0f22d3ddf Update to 14.0.7RC1 2019-01-31 10:51:39 +00:00
marceljd
e0de4ab285 removed old redis.config.php files
On branch redis-env-vars
 Changes to be committed:
	deleted:    ../../apache/app/redis.config.php
	deleted:    redis.config.php
	deleted:    ../../../../with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php
	deleted:    ../../../../with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php

Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 15:08:57 +00:00
marceljd
d3cd3b812f On branch redis-env-vars
run update.sh
 Changes to be committed:
	modified:   13.0/apache/config/redis.config.php
	modified:   13.0/fpm-alpine/config/redis.config.php
	modified:   13.0/fpm/config/redis.config.php
	modified:   14.0/apache/config/redis.config.php
	modified:   14.0/fpm-alpine/config/redis.config.php
	modified:   14.0/fpm/config/redis.config.php
	modified:   15.0/apache/config/redis.config.php
	modified:   15.0/fpm-alpine/config/redis.config.php
	modified:   15.0/fpm/config/redis.config.php

Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
b3b6def923 On branch redis-env-vars
added REDIS_HOST_PORT
 Changes to be committed:
	modified:   .config/redis.config.php
	modified:   README.md

Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
2e481a86ee Updated ' to ` for better formatting
Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
a9f458ce9f Changes to be committed:
modified:   .config/redis.config.php
	modified:   .examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
	modified:   .examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
	modified:   .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
	modified:   .examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
	modified:   13.0/apache/Dockerfile
	modified:   13.0/apache/config/redis.config.php
	modified:   13.0/fpm-alpine/Dockerfile
	modified:   13.0/fpm-alpine/config/redis.config.php
	modified:   13.0/fpm/Dockerfile
	modified:   13.0/fpm/config/redis.config.php
	modified:   14.0/apache/Dockerfile
	modified:   14.0/apache/config/redis.config.php
	modified:   14.0/fpm-alpine/Dockerfile
	modified:   14.0/fpm-alpine/config/redis.config.php
	modified:   14.0/fpm/Dockerfile
	modified:   14.0/fpm/config/redis.config.php
	modified:   15.0/apache/Dockerfile
	modified:   15.0/apache/config/redis.config.php
	modified:   15.0/fpm-alpine/Dockerfile
	modified:   15.0/fpm-alpine/config/redis.config.php
	modified:   15.0/fpm/Dockerfile
	modified:   15.0/fpm/config/redis.config.php
	modified:   README.md

Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
d1db681058 Update redis.config.php
Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
536fb66212 Only redis_host without port
Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
f2ee88d352 set redis environment variables
Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
marceljd
ba4c1359b9 set redis environment variables
Signed-off-by: marceljd <support@dihosting.ch>
2019-01-27 13:46:25 +00:00
J0WI
250802c706
Merge pull request #586 from nicokaiser/nginx-woff2
Fix woff2 files in nginx examples
2019-01-21 17:57:56 +01:00
Tilo Spannagel
f081d3864d
Ship 15.0.2 on stable channel (#615)
See: https://github.com/nextcloud/updater_server/pull/183
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2019-01-21 17:00:22 +01:00
Nico Kaiser
f3524791d9 Fix woff2 files in nginx examples
Since some versions of Nextcloud, fonts are served as woff2, which is
not forwarded to index.php by the supplied nginx.conf. This leads to
nginx returning the dynamic index page instead of the static fonts.

Signed-off-by: Nico Kaiser <nico@kaiser.me>
2019-01-21 16:55:55 +01:00