1
- FROM niiknow/docker-hostingbase:1.5.3
1
+ FROM niiknow/docker-hostingbase:1.6.1
2
2
LABEL maintainer="noogen <friends@niiknow.org>"
3
3
ENV DEBIAN_FRONTEND=noninteractive \
4
4
VESTA=/usr/local/vesta \
@@ -62,16 +62,16 @@ RUN cd /tmp \
62
62
&& cd ${NGINX_BUILD_DIR}/nginx-${NGINX_VERSION}; dpkg-buildpackage -uc -us -b \
63
63
&& cd ${NGINX_BUILD_DIR} \
64
64
&& dpkg -i nginx_${NGINX_VERSION}-2~xenial_amd64.deb \
65
+ && apt-get install -yq php8.0-mbstring php8.0-cgi php8.0-cli php8.0-dev php8.0-common php8.0-sybase php8.0-curl \
66
+ php8.0-enchant php8.0-imap php8.0-xsl php8.0-mysql php8.0-mysqli php8.0-mysqlnd php8.0-pspell php8.0-gd php8.0-zip \
67
+ php8.0-tidy php8.0-opcache php8.0-bz2 php8.0-pgsql php8.0-readline php8.0-imagick php7.3-phar \
68
+ php8.0-intl php8.0-sqlite3 php8.0-ldap php8.0-xml php8.0-redis php8.0-fpm \
69
+ php8.0-soap php8.0-bcmath php8.0-fileinfo php8.0-xdebug php8.0-exif php8.0-tokenizer \
65
70
&& apt-get install -yq php7.4-mbstring php7.4-cgi php7.4-cli php7.4-dev php7.4-geoip php7.4-common php7.4-xmlrpc php7.4-sybase php7.4-curl \
66
71
php7.4-enchant php7.4-imap php7.4-xsl php7.4-mysql php7.4-mysqli php7.4-mysqlnd php7.4-pspell php7.4-gd php7.4-zip \
67
72
php7.4-tidy php7.4-opcache php7.4-json php7.4-bz2 php7.4-pgsql php7.4-readline php7.4-imagick php7.3-phar \
68
73
php7.4-intl php7.4-sqlite3 php7.4-ldap php7.4-xml php7.4-redis php7.4-fpm \
69
74
php7.4-soap php7.4-bcmath php7.4-fileinfo php7.4-xdebug php7.4-exif php7.4-tokenizer \
70
- && apt-get install -yq php7.2-mbstring php7.2-cgi php7.2-cli php7.2-dev php7.2-geoip php7.2-common php7.2-xmlrpc php7.2-sybase php7.2-curl \
71
- php7.2-enchant php7.2-imap php7.2-xsl php7.2-mysql php7.2-mysqli php7.2-mysqlnd php7.2-pspell php7.2-gd php7.2-zip \
72
- php7.2-tidy php7.2-opcache php7.2-json php7.2-bz2 php7.2-pgsql php7.2-readline php7.2-imagick php7.2-phar \
73
- php7.2-intl php7.2-sqlite3 php7.2-ldap php7.2-xml php7.2-redis php7.2-fpm \
74
- php7.2-soap php7.2-bcmath php7.2-fileinfo php7.2-xdebug php7.2-exif php7.2-tokenizer \
75
75
&& apt-get install -yq php7.3-mbstring php7.3-cgi php7.3-cli php7.3-dev php7.3-geoip php7.3-common php7.3-xmlrpc php7.3-sybase php7.3-curl \
76
76
php7.3-enchant php7.3-imap php7.3-xsl php7.3-mysql php7.3-mysqli php7.3-mysqlnd php7.3-pspell php7.3-gd php7.3-zip \
77
77
php7.3-tidy php7.3-opcache php7.3-json php7.3-bz2 php7.3-pgsql php7.3-readline php7.3-imagick php7.3-phar \
@@ -115,8 +115,8 @@ RUN cd /tmp \
115
115
# begin apache stuff
116
116
&& service apache2 stop && service vesta stop \
117
117
118
- # install additional mods since 7.2 became default in the php repo
119
- && apt-get install -yf --no-install-recommends libapache2-mod-php7.4 libapache2-mod-php7.2 libapache2-mod-php7.3 \
118
+ # install additional mods
119
+ && apt-get install -yf --no-install-recommends libapache2-mod-php8.0 libapache2-mod-php7.4 libapache2-mod-php7.3 \
120
120
postgresql-9.6-postgis-2.5 postgresql-9.6-pgrouting postgis postgis-gui postgresql-9.6-pgaudit \
121
121
postgresql-9.6-postgis-2.5-scripts postgresql-9.6-repack \
122
122
@@ -157,14 +157,14 @@ RUN cd /tmp \
157
157
&& mv /sysprepz/admin/bin/vesta-*.sh /bin \
158
158
159
159
# install iconcube loader extension
160
- # && /bin/vesta-ioncube-install.sh 7.4 \
161
- && /bin/vesta-ioncube-install.sh 7.2 \
160
+ # && /bin/vesta-ioncube-install.sh 8.0 \
161
+ && /bin/vesta-ioncube-install.sh 7.4 \
162
162
&& /bin/vesta-ioncube-install.sh 7.3 \
163
163
164
- # make sure we default fcgi and php to 7.2
164
+ # make sure we default fcgi and php to 7.4
165
165
&& mv /usr/bin/php-cgi /usr/bin/php-cgi-old \
166
- && ln -s /usr/bin/php-cgi7.2 /usr/bin/php-cgi \
167
- && /usr/bin/switch-php.sh "7.2 " \
166
+ && ln -s /usr/bin/php-cgi7.4 /usr/bin/php-cgi \
167
+ && /usr/bin/switch-php.sh "7.4 " \
168
168
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
169
169
170
170
# remove phpmyadmin, phppgadmin
@@ -187,23 +187,17 @@ RUN cd /tmp \
187
187
&& ln -sf /etc/php/7.4/mods-available/v8js.ini /etc/php/7.4/cgi/conf.d/20-v8js.ini \
188
188
&& ln -sf /etc/php/7.4/mods-available/v8js.ini /etc/php/7.4/fpm/conf.d/20-v8js.ini \
189
189
190
- && echo "extension=v8js.so" > /etc/php/7.2/mods-available/v8js.ini \
191
- && ln -sf /etc/php/7.2/mods-available/v8js.ini /etc/php/7.2/apache2/conf.d/20-v8js.ini \
192
- && ln -sf /etc/php/7.2/mods-available/v8js.ini /etc/php/7.2/cli/conf.d/20-v8js.ini \
193
- && ln -sf /etc/php/7.2/mods-available/v8js.ini /etc/php/7.2/cgi/conf.d/20-v8js.ini \
194
- && ln -sf /etc/php/7.2/mods-available/v8js.ini /etc/php/7.2/fpm/conf.d/20-v8js.ini \
195
-
196
190
&& echo "extension=v8js.so" > /etc/php/7.3/mods-available/v8js.ini \
197
191
&& ln -sf /etc/php/7.3/mods-available/v8js.ini /etc/php/7.3/apache2/conf.d/20-v8js.ini \
198
192
&& ln -sf /etc/php/7.3/mods-available/v8js.ini /etc/php/7.3/cli/conf.d/20-v8js.ini \
199
193
&& ln -sf /etc/php/7.3/mods-available/v8js.ini /etc/php/7.3/cgi/conf.d/20-v8js.ini \
200
194
&& ln -sf /etc/php/7.3/mods-available/v8js.ini /etc/php/7.3/fpm/conf.d/20-v8js.ini \
201
195
202
- && echo "extension=pcs.so" > /etc/php/7.2 /mods-available/pcs.ini \
203
- && ln -sf /etc/php/7.2 /mods-available/pcs.ini /etc/php/7.2 /apache2/conf.d/15-pcs.ini \
204
- && ln -sf /etc/php/7.2 /mods-available/pcs.ini /etc/php/7.2 /cli/conf.d/15-pcs.ini \
205
- && ln -sf /etc/php/7.2 /mods-available/pcs.ini /etc/php/7.2 /cgi/conf.d/15-pcs.ini \
206
- && ln -sf /etc/php/7.2 /mods-available/pcs.ini /etc/php/7.2 /fpm/conf.d/15-pcs.ini \
196
+ && echo "extension=pcs.so" > /etc/php/7.4 /mods-available/pcs.ini \
197
+ && ln -sf /etc/php/7.4 /mods-available/pcs.ini /etc/php/7.4 /apache2/conf.d/15-pcs.ini \
198
+ && ln -sf /etc/php/7.4 /mods-available/pcs.ini /etc/php/7.4 /cli/conf.d/15-pcs.ini \
199
+ && ln -sf /etc/php/7.4 /mods-available/pcs.ini /etc/php/7.4 /cgi/conf.d/15-pcs.ini \
200
+ && ln -sf /etc/php/7.4 /mods-available/pcs.ini /etc/php/7.4 /fpm/conf.d/15-pcs.ini \
207
201
208
202
&& echo "extension=pcs.so" > /etc/php/7.3/mods-available/pcs.ini \
209
203
&& ln -sf /etc/php/7.3/mods-available/pcs.ini /etc/php/7.3/apache2/conf.d/15-pcs.ini \
@@ -217,12 +211,6 @@ RUN cd /tmp \
217
211
&& ln -sf /etc/php/7.4/mods-available/couchbase.ini /etc/php/7.4/cgi/conf.d/30-couchbase.ini \
218
212
&& ln -sf /etc/php/7.4/mods-available/couchbase.ini /etc/php/7.4/fpm/conf.d/30-couchbase.ini \
219
213
220
- && echo "extension=couchbase.so" > /etc/php/7.2/mods-available/couchbase.ini \
221
- && ln -sf /etc/php/7.2/mods-available/couchbase.ini /etc/php/7.2/apache2/conf.d/30-couchbase.ini \
222
- && ln -sf /etc/php/7.2/mods-available/couchbase.ini /etc/php/7.2/cli/conf.d/30-couchbase.ini \
223
- && ln -sf /etc/php/7.2/mods-available/couchbase.ini /etc/php/7.2/cgi/conf.d/30-couchbase.ini \
224
- && ln -sf /etc/php/7.2/mods-available/couchbase.ini /etc/php/7.2/fpm/conf.d/30-couchbase.ini \
225
-
226
214
&& echo "extension=couchbase.so" > /etc/php/7.3/mods-available/couchbase.ini \
227
215
&& ln -sf /etc/php/7.3/mods-available/couchbase.ini /etc/php/7.3/apache2/conf.d/30-couchbase.ini \
228
216
&& ln -sf /etc/php/7.3/mods-available/couchbase.ini /etc/php/7.3/cli/conf.d/30-couchbase.ini \
@@ -264,76 +252,76 @@ RUN cd /tmp \
264
252
&& sed -i -e "s/^#listen_addresses = 'localhost'/listen_addresses = '*'/g" /etc/postgresql/9.6/main/postgresql.conf \
265
253
266
254
# php stuff - after vesta because of vesta-php installs
255
+ && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/8.0/apache2/php.ini \
256
+ && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/8.0/cli/php.ini \
257
+ && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/8.0/cgi/php.ini \
258
+ && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/8.0/fpm/php.ini \
259
+
267
260
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.4/apache2/php.ini \
268
261
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.4/cli/php.ini \
269
262
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.4/cgi/php.ini \
270
263
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.4/fpm/php.ini \
271
264
272
- && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.2/apache2/php.ini \
273
- && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.2/cli/php.ini \
274
- && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.2/cgi/php.ini \
275
- && sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.2/fpm/php.ini \
276
-
277
265
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.3/apache2/php.ini \
278
266
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.3/cli/php.ini \
279
267
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.3/cgi/php.ini \
280
268
&& sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 600M/" /etc/php/7.3/fpm/php.ini \
281
269
270
+ && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/8.0/apache2/php.ini \
271
+ && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/8.0/cli/php.ini \
272
+ && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/8.0/cgi/php.ini \
273
+ && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/8.0/fpm/php.ini \
274
+
282
275
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.4/apache2/php.ini \
283
276
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.4/cli/php.ini \
284
277
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.4/cgi/php.ini \
285
278
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.4/fpm/php.ini \
286
279
287
- && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.2/apache2/php.ini \
288
- && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.2/cli/php.ini \
289
- && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.2/cgi/php.ini \
290
- && sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.2/fpm/php.ini \
291
-
292
280
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.3/apache2/php.ini \
293
281
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.3/cli/php.ini \
294
282
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.3/cgi/php.ini \
295
283
&& sed -i "s/post_max_size = 8M/post_max_size = 600M/" /etc/php/7.3/fpm/php.ini \
296
284
285
+ && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/8.0/apache2/php.ini \
286
+ && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/8.0/cli/php.ini \
287
+ && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/8.0/cgi/php.ini \
288
+ && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/8.0/fpm/php.ini \
289
+
297
290
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.4/apache2/php.ini \
298
291
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.4/cli/php.ini \
299
292
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.4/cgi/php.ini \
300
293
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.4/fpm/php.ini \
301
294
302
- && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.2/apache2/php.ini \
303
- && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.2/cli/php.ini \
304
- && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.2/cgi/php.ini \
305
- && sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.2/fpm/php.ini \
306
-
307
295
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.3/apache2/php.ini \
308
296
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.3/cli/php.ini \
309
297
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.3/cgi/php.ini \
310
298
&& sed -i "s/max_input_time = 60/max_input_time = 3600/" /etc/php/7.3/fpm/php.ini \
311
299
300
+ && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/8.0/apache2/php.ini \
301
+ && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/8.0/cli/php.ini \
302
+ && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/8.0/cgi/php.ini \
303
+ && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/8.0/fpm/php.ini \
304
+
312
305
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.4/apache2/php.ini \
313
306
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.4/cli/php.ini \
314
307
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.4/cgi/php.ini \
315
308
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.4/fpm/php.ini \
316
309
317
- && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.2/apache2/php.ini \
318
- && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.2/cli/php.ini \
319
- && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.2/cgi/php.ini \
320
- && sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.2/fpm/php.ini \
321
-
322
310
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.3/apache2/php.ini \
323
311
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.3/cli/php.ini \
324
312
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.3/cgi/php.ini \
325
313
&& sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.3/fpm/php.ini \
326
314
315
+ && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/8.0/apache2/php.ini \
316
+ && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/8.0/cli/php.ini \
317
+ && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/8.0/cgi/php.ini \
318
+ && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/8.0/fpm/php.ini \
319
+
327
320
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.4/apache2/php.ini \
328
321
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.4/cli/php.ini \
329
322
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.4/cgi/php.ini \
330
323
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.4/fpm/php.ini \
331
324
332
- && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.2/apache2/php.ini \
333
- && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.2/cli/php.ini \
334
- && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.2/cgi/php.ini \
335
- && sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.2/fpm/php.ini \
336
-
337
325
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.3/apache2/php.ini \
338
326
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.3/cli/php.ini \
339
327
&& sed -i -e "s/;sendmail_path =/sendmail_path = \/ usr\/ sbin\/ exim \- t/g" /etc/php/7.3/cgi/php.ini \
@@ -368,9 +356,9 @@ RUN cd /tmp \
368
356
&& sed -i -e "s/ROLE \$ DBUSER/ROLE \$ DBUSER WITH LOGIN/g" /usr/local/vesta/func/rebuild.sh \
369
357
&& sed -i -e "s/plsql/psql/g" /usr/local/vesta/bin/v-update-sys-rrd-pgsql \
370
358
371
- # apache stuff
359
+ # apache stuff, default php7.4
372
360
&& echo "\n ServerName localhost\n " >> /etc/apache2/apache2.conf \
373
- && a2enmod headers && a2dismod php7.3 && a2dismod php7.4 && a2enmod php7.2 \
361
+ && a2enmod headers && a2dismod php7.3 && a2dismod php8.0 && a2enmod php7.4 \
374
362
375
363
# disable localhost redirect to bad default IP
376
364
&& sed -i -e "s/^NAT=.*/NAT=\'\' /g" /usr/local/vesta/data/ips/* \
0 commit comments