Skip to content

Commit bfeb118

Browse files
MrPetovanMrPetovan
authored
Merge pull request #296 from ne20002/feat/data-volume
/var/www/data is now a volume
2 parents ae32b83 + 8166500 commit bfeb118

21 files changed

+76
-65
lines changed

‎.config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.08/apache/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
166162
} > /etc/apache2/conf-available/remoteip.conf; \
167163
a2enconf remoteip;
168164

165+
RUN set -ex; \
166+
mkdir -p -m 775 /var/www/data; \
167+
chown -R www-data:www-data /var/www/data
168+
169169
VOLUME /var/www/html
170+
VOLUME /var/www/data
170171

171172
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
172173
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.08/apache/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.08/fpm-alpine/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,17 @@ RUN set -ex; \
128128
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
129129
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
130130
} > /usr/local/etc/php/conf.d/friendica.ini; \
131-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
132-
\
133-
mkdir /var/www/data; \
134-
chown -R www-data:root /var/www; \
135-
chmod -R g=u /var/www
131+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
136132

137133
RUN set -ex; \
138134
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
139135

136+
RUN set -ex; \
137+
mkdir -p -m 775 /var/www/data; \
138+
chown -R www-data:www-data /var/www/data
139+
140140
VOLUME /var/www/html
141+
VOLUME /var/www/data
141142

142143
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
143144
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.08/fpm-alpine/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.08/fpm/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,17 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
160156

157+
RUN set -ex; \
158+
mkdir -p -m 775 /var/www/data; \
159+
chown -R www-data:www-data /var/www/data
160+
161161
VOLUME /var/www/html
162+
VOLUME /var/www/data
162163

163164
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
164165
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.08/fpm/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.12/apache/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
166162
} > /etc/apache2/conf-available/remoteip.conf; \
167163
a2enconf remoteip;
168164

165+
RUN set -ex; \
166+
mkdir -p -m 775 /var/www/data; \
167+
chown -R www-data:www-data /var/www/data
168+
169169
VOLUME /var/www/html
170+
VOLUME /var/www/data
170171

171172
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
172173
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.12/apache/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.12/fpm-alpine/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,17 @@ RUN set -ex; \
128128
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
129129
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
130130
} > /usr/local/etc/php/conf.d/friendica.ini; \
131-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
132-
\
133-
mkdir /var/www/data; \
134-
chown -R www-data:root /var/www; \
135-
chmod -R g=u /var/www
131+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
136132

137133
RUN set -ex; \
138134
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
139135

136+
RUN set -ex; \
137+
mkdir -p -m 775 /var/www/data; \
138+
chown -R www-data:www-data /var/www/data
139+
140140
VOLUME /var/www/html
141+
VOLUME /var/www/data
141142

142143
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
143144
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.12/fpm-alpine/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2024.12/fpm/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,17 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
160156

157+
RUN set -ex; \
158+
mkdir -p -m 775 /var/www/data; \
159+
chown -R www-data:www-data /var/www/data
160+
161161
VOLUME /var/www/html
162+
VOLUME /var/www/data
162163

163164
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
164165
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2024.12/fpm/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2025.02-dev/apache/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,7 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
a2enmod rewrite remoteip; \
@@ -166,7 +162,12 @@ RUN set -ex; \
166162
} > /etc/apache2/conf-available/remoteip.conf; \
167163
a2enconf remoteip;
168164

165+
RUN set -ex; \
166+
mkdir -p -m 775 /var/www/data; \
167+
chown -R www-data:www-data /var/www/data
168+
169169
VOLUME /var/www/html
170+
VOLUME /var/www/data
170171

171172
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
172173
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2025.02-dev/apache/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2025.02-dev/fpm-alpine/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,17 @@ RUN set -ex; \
128128
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
129129
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
130130
} > /usr/local/etc/php/conf.d/friendica.ini; \
131-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
132-
\
133-
mkdir /var/www/data; \
134-
chown -R www-data:root /var/www; \
135-
chmod -R g=u /var/www
131+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
136132

137133
RUN set -ex; \
138134
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
139135

136+
RUN set -ex; \
137+
mkdir -p -m 775 /var/www/data; \
138+
chown -R www-data:www-data /var/www/data
139+
140140
VOLUME /var/www/html
141+
VOLUME /var/www/data
141142

142143
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
143144
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2025.02-dev/fpm-alpine/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎2025.02-dev/fpm/Dockerfile

+6-5
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,17 @@ RUN set -ex; \
149149
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
150150
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
151151
} > /usr/local/etc/php/conf.d/friendica.ini; \
152-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
153-
\
154-
mkdir /var/www/data; \
155-
chown -R www-data:root /var/www; \
156-
chmod -R g=u /var/www
152+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
157153

158154
RUN set -ex; \
159155
echo access.format = '%{REMOTE_ADDR}e - %u %t "%m %r" %s' >> /usr/local/etc/php-fpm.d/docker.conf;
160156

157+
RUN set -ex; \
158+
mkdir -p -m 775 /var/www/data; \
159+
chown -R www-data:www-data /var/www/data
160+
161161
VOLUME /var/www/html
162+
VOLUME /var/www/data
162163

163164
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
164165
ENV FRIENDICA_SYSLOG_FLAGS 39

‎2025.02-dev/fpm/config/zz-docker.config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
'loglevel' => 'notice',
1717
],
1818
'storage' => [
19-
'filesystem_path' => '/var/www/html/storage',
19+
'filesystem_path' => '/var/www/data',
2020
],
2121
];
2222

‎Dockerfile-alpine.template

+6-5
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,16 @@ RUN set -ex; \
127127
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
128128
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
129129
} > /usr/local/etc/php/conf.d/friendica.ini; \
130-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
131-
\
132-
mkdir /var/www/data; \
133-
chown -R www-data:root /var/www; \
134-
chmod -R g=u /var/www
130+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
135131

136132
%%VARIANT_EXTRAS%%
137133

134+
RUN set -ex; \
135+
mkdir -p -m 775 /var/www/data; \
136+
chown -R www-data:www-data /var/www/data
137+
138138
VOLUME /var/www/html
139+
VOLUME /var/www/data
139140

140141
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
141142
ENV FRIENDICA_SYSLOG_FLAGS 39

‎Dockerfile-debian.template

+6-5
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,16 @@ RUN set -ex; \
148148
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
149149
echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
150150
} > /usr/local/etc/php/conf.d/friendica.ini; \
151-
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
152-
\
153-
mkdir /var/www/data; \
154-
chown -R www-data:root /var/www; \
155-
chmod -R g=u /var/www
151+
ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
156152

157153
%%VARIANT_EXTRAS%%
158154

155+
RUN set -ex; \
156+
mkdir -p -m 775 /var/www/data; \
157+
chown -R www-data:www-data /var/www/data
158+
159159
VOLUME /var/www/html
160+
VOLUME /var/www/data
160161

161162
# 39 = LOG_PID | LOG_ODELAY | LOG_CONS | LOG_PERROR
162163
ENV FRIENDICA_SYSLOG_FLAGS 39

0 commit comments

Comments
 (0)