diff --git a/Dockerfile b/Dockerfile index 5f15954..dd5fe12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,14 +19,14 @@ ENV PGHOST=db \ # Install git, Apache2 + PHP + PostgreSQL webserver, sendmail, wkhtmltopdf & others utilities. RUN apt-get update && \ apt-get upgrade -y && \ - apt-get install postgresql-client wkhtmltopdf libpq-dev libpng-dev libxml2-dev libzip-dev libonig-dev sendmail -y; + apt-get install postgresql-client wkhtmltopdf libpq-dev libpng-dev libxml2-dev libzip-dev libonig-dev sendmail nano locales -y; # Install PHP extensions. RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-install -j$(nproc) gd mbstring xml pgsql gettext xmlrpc zip # Download and extract rosariosis -ENV ROSARIOSIS_VERSION 'v7.2.4' +ENV ROSARIOSIS_VERSION 'v7.3.1' RUN mkdir /usr/src/rosariosis && \ curl -L https://gitlab.com/francoisjacquet/rosariosis/-/archive/${ROSARIOSIS_VERSION}/rosariosis-${ROSARIOSIS_VERSION}.tar.gz \ | tar xz --strip-components=1 -C /usr/src/rosariosis && \ diff --git a/conf/config.inc.php b/conf/config.inc.php index a9d7e50..25140ee 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -53,7 +53,7 @@ $pg_dumpPath = '/usr/bin/pg_dump'; * @example /usr/local/bin/wkhtmltopdf * @example C:/Progra~1/wkhtmltopdf/bin/wkhtmltopdf.exe */ -$wkhtmltopdfPath = 'wkhtmltopdf'; +$wkhtmltopdfPath = '/usr/bin/wkhtmltopdf'; /**