Commit 2deeb901 authored by godog's avatar godog
Browse files

Switch to Buster and php 7.3

parent d011e2ba
Pipeline #6561 passed with stage
in 2 minutes and 34 seconds
......@@ -6,7 +6,7 @@ ADD . /build
RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends bash curl make patch rsync default-jre-headless wget unzip
RUN /build/install-roundcube --version=${RC_VERSION} --destdir=/build/src build && echo ${RC_VERSION} > /build/src/.rc_version
FROM registry.git.autistici.org/ai3/docker/apache2-php-base:master
FROM registry.git.autistici.org/ai3/docker/apache2-php-base:buster
COPY conf /tmp/conf
COPY build.sh /tmp/build.sh
......
......@@ -14,26 +14,23 @@ BUILD_PACKAGES="rsync"
# Packages required to serve the website and run the services, in
# addition to those already installed by the base apache2 image.
PACKAGES="
libapache2-mod-sso
php-gd
php-imap
php-mcrypt
php-mbstring
php-xml
php-zip
mysql-client
libapache2-mod-sso
php-imap
php-xml
php-zip
mariadb-client
"
# Apache modules to enable.
APACHE_MODULES_ENABLE="
rewrite
sso
unique_id
rewrite
sso
unique_id
"
# Sites to enable.
APACHE_SITES="
webmail
webmail
"
# The default bitnami/minideb image defines an 'install_packages'
......
[www]
listen = /run/php/php7.0-fpm.sock
listen = /run/php/php7.3-fpm.sock
pm = dynamic
pm.max_children = 80
......@@ -27,7 +27,6 @@ php_admin_value[opcache.memory_consumption] = 64
php_admin_value[opcache.interned_strings_buffer] = 16
php_admin_value[opcache.max_accelerated_files] = 4000
php_admin_value[opcache.validate_timestamps] = 0
php_admin_value[opcache.fast_shutdown] = 1
php_admin_value[upload_max_filesize] = 20M
php_admin_value[post_max_size] = 20M
......@@ -48,7 +48,7 @@ if [ -z "${cur_version}" ]; then
${MYSQL} -e "create table rc_version (version text); insert into rc_version (version) values ('unknown')" ${MYSQL_DB} \
|| die "could not create rc_version table in ${MYSQL_DB}"
fi
# Run database upgrade if necessary.
if [ "${rc_version}" != "${cur_version}" ]; then
${TARGET_DIR}/bin/update.sh -v ${cur_version} -y \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment