2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2026-01-08 06:37:58 +01:00

Adding support for new *.config.php format.

But add backward compatibility for old *.ini.php too
This commit is contained in:
Philipp Holzer 2018-12-29 21:34:21 +01:00
commit c485511739
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
40 changed files with 131 additions and 111 deletions

View file

@ -1,4 +1,4 @@
FROM friendica/server:apache
RUN mkdir -p /usr/src/config
COPY addon.ini.php /usr/src/config/
COPY addon.config.php /usr/src/config/

View file

@ -0,0 +1,12 @@
<?php
return [
'system' => [
'cache_driver' => 'redis',
'lock_driver' => 'redis',
'redis_host' => 'redis',
'pidfile' => '/var/run/friendica.pid',
]
];

View file

@ -1,12 +0,0 @@
<?php return <<<INI
[system]
cache_driver=redis
lock_driver=redis
redis_host=redis
pidfile = /var/run/friendica.pid
INI;
// Keep this line

View file

@ -1,4 +1,4 @@
FROM friendica/server:fpm-alpine
RUN mkdir -p /usr/src/config
COPY addon.ini.php /usr/src/config/
COPY addon.config.php /usr/src/config/

View file

@ -0,0 +1,12 @@
<?php
return [
'system' => [
'cache_driver' => 'redis',
'lock_driver' => 'redis',
'redis_host' => 'redis',
'pidfile' => '/var/run/friendica.pid',
]
];

View file

@ -1,12 +0,0 @@
<?php return <<<INI
[system]
cache_driver=redis
lock_driver=redis
redis_host=redis
pidfile = /var/run/friendica.pid
INI;
// Keep this line

View file

@ -1,4 +1,4 @@
FROM friendica/server:fpm
RUN mkdir -p /usr/src/config
COPY addon.ini.php /usr/src/config/
COPY addon.config.php /usr/src/config/

View file

@ -0,0 +1,12 @@
<?php
return [
'system' => [
'cache_driver' => 'redis',
'lock_driver' => 'redis',
'redis_host' => 'redis',
'pidfile' => '/var/run/friendica.pid',
]
];

View file

@ -1,12 +0,0 @@
<?php return <<<INI
[system]
cache_driver=redis
lock_driver=redis
redis_host=redis
pidfile = /var/run/friendica.pid
INI;
// Keep this line