friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-30 03:37:07 +02:00
Code Issues Releases Wiki Activity

Merge pull request #296 from ne20002/feat/data-volume

Browse source 
/var/www/data is now a volume
This commit is contained in:
Hypolite Petovan 2025-02-25 19:58:59 -05:00 • committed by GitHub
commit bfeb118d8f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 76 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.08/apache/Dockerfile
View file

@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
a2enmod rewrite remoteip; \ a2enmod rewrite remoteip; \
@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; a2enconf remoteip;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.08/apache/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.08/fpm-alpine/Dockerfile
View file

@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.08/fpm-alpine/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.08/fpm/Dockerfile
View file

@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.08/fpm/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.12/apache/Dockerfile
View file

@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
a2enmod rewrite remoteip; \ a2enmod rewrite remoteip; \
@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; a2enconf remoteip;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.12/apache/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.12/fpm-alpine/Dockerfile
View file

@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.12/fpm-alpine/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2024.12/fpm/Dockerfile
View file

@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2024.12/fpm/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2025.02-dev/apache/Dockerfile
View file

@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
a2enmod rewrite remoteip; \ a2enmod rewrite remoteip; \
@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \ } > /etc/apache2/conf-available/remoteip.conf; \
a2enconf remoteip; a2enconf remoteip;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2025.02-dev/apache/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2025.02-dev/fpm-alpine/Dockerfile
View file

@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2025.02-dev/fpm-alpine/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
2025.02-dev/fpm/Dockerfile
View file

@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
RUN set -ex; \ RUN set -ex; \
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf; echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

2
2025.02-dev/fpm/config/zz-docker.config.php
View file

@ -16,7 +16,7 @@ $config = [
'loglevel' => 'notice', 'loglevel' => 'notice',
], ],
'storage' => [ 'storage' => [
'filesystem_path' => '/var/www/html/storage', 'filesystem_path' => '/var/www/data',
], ],
]; ];

11
Dockerfile-alpine.template
View file

@ -127,15 +127,16 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
%%VARIANT_EXTRAS%% %%VARIANT_EXTRAS%%
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39

11
Dockerfile-debian.template
View file

@ -148,15 +148,16 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.ini; \ } > /usr/local/etc/php/conf.d/friendica.ini; \
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
\
mkdir /var/www/data; \
chown -R www-data:root /var/www; \
chmod -R g=u /var/www
%%VARIANT_EXTRAS%% %%VARIANT_EXTRAS%%
RUN set -ex; \
mkdir -p -m 775 /var/www/data; \
chown -R www-data:www-data /var/www/data
VOLUME /var/www/html VOLUME /var/www/html
VOLUME /var/www/data
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR # 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39 ENV FRIENDICA_SYSLOG_FLAGS 39