Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/var/www/data is now a volume #296

Merged
merged 1 commit into from
Feb 26, 2025
Merged

/var/www/data is now a volume #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.08/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
a2enmod rewrite remoteip; \
Expand All @@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.08/apache/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.08/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.08/fpm-alpine/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.08/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.08/fpm/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.12/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
a2enmod rewrite remoteip; \
Expand All @@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.12/apache/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.12/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.12/fpm-alpine/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2024.12/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2024.12/fpm/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2025.02-dev/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
a2enmod rewrite remoteip; \
Expand All @@ -166,7 +162,12 @@ RUN set -ex; \
} > /etc/apache2/conf-available/remoteip.conf; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2025.02-dev/apache/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2025.02-dev/fpm-alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2025.02-dev/fpm-alpine/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions 2025.02-dev/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,17 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

RUN set -ex; \
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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
2 changes: 1 addition & 1 deletion 2025.02-dev/fpm/config/zz-docker.config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'loglevel' => 'notice',
],
'storage' => [
'filesystem_path' => '/var/www/html/storage',
'filesystem_path' => '/var/www/data',
],
];

Expand Down
11 changes: 6 additions & 5 deletions Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,16 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

%%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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,16 @@ RUN set -ex; \
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
} > /usr/local/etc/php/conf.d/friendica.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
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

%%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/data

# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
ENV FRIENDICA_SYSLOG_FLAGS 39
Expand Down