From 8d0136ad4410e9d95534a673710bfa44dbc71ff2 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 25 Nov 2020 15:06:52 +0100 Subject: [PATCH 1/4] Update Dockerfile "locale" package was missing, therefore gettext couldn't translate --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5f15954..8f3867a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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 locale -y; # Install PHP extensions. RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ From 985e176b040754b618dbff49f6db346c7b2111e0 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 25 Nov 2020 15:13:49 +0100 Subject: [PATCH 2/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8f3867a..03bd47e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ 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 && \ From d6696baa825749e8839b23c92a424cf55cda5f2e Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 25 Nov 2020 15:19:06 +0100 Subject: [PATCH 3/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03bd47e..dd5fe12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ 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 nano locale -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; \ From 89fe42554ea772a5f19ca7c4f6c12dd7c212e6f6 Mon Sep 17 00:00:00 2001 From: Matthieu Date: Wed, 25 Nov 2020 15:21:11 +0100 Subject: [PATCH 4/4] Update config.inc.php Added full path to /usr/bin/wkhtmltopdf --- conf/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'; /**