octoleo/docker-rosariosis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from pagaille/patch-1

Browse Source 
Update Dockerfile
This commit is contained in:
François Jacquet 2020-11-26 20:20:22 +01:00 committed by GitHub
commit 51e6eef3f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -19,14 +19,14 @@ ENV PGHOST=db \
# Install git, Apache2 + PHP + PostgreSQL webserver, sendmail, wkhtmltopdf & others utilities. # Install git, Apache2 + PHP + PostgreSQL webserver, sendmail, wkhtmltopdf & others utilities.
RUN apt-get update && \ RUN apt-get update && \
apt-get upgrade -y && \ 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. # Install PHP extensions.
RUN docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ 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 docker-php-ext-install -j$(nproc) gd mbstring xml pgsql gettext xmlrpc zip
# Download and extract rosariosis # Download and extract rosariosis
ENV ROSARIOSIS_VERSION 'v7.2.4' ENV ROSARIOSIS_VERSION 'v7.3.1'
RUN mkdir /usr/src/rosariosis && \ RUN mkdir /usr/src/rosariosis && \
curl -L https://gitlab.com/francoisjacquet/rosariosis/-/archive/${ROSARIOSIS_VERSION}/rosariosis-${ROSARIOSIS_VERSION}.tar.gz \ curl -L https://gitlab.com/francoisjacquet/rosariosis/-/archive/${ROSARIOSIS_VERSION}/rosariosis-${ROSARIOSIS_VERSION}.tar.gz \
| tar xz --strip-components=1 -C /usr/src/rosariosis && \ | tar xz --strip-components=1 -C /usr/src/rosariosis && \

2
conf/config.inc.php
View File

@ -53,7 +53,7 @@ $pg_dumpPath = '/usr/bin/pg_dump';
* @example /usr/local/bin/wkhtmltopdf * @example /usr/local/bin/wkhtmltopdf
* @example C:/Progra~1/wkhtmltopdf/bin/wkhtmltopdf.exe * @example C:/Progra~1/wkhtmltopdf/bin/wkhtmltopdf.exe
*/ */
$wkhtmltopdfPath = 'wkhtmltopdf'; $wkhtmltopdfPath = '/usr/bin/wkhtmltopdf';
/** /**