diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-06-19 14:54:38 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-06-19 14:54:38 +0200 |
commit | 2a61e13fae4e71c804e96caefd3fdb46f09a81db (patch) | |
tree | b424699c636777b1b83f2143ba1c40b8610b2cad /docker/php | |
parent | 3ed30d3415842de43bed332e2228d5b2157472cc (diff) | |
download | wallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.tar.gz wallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.tar.zst wallabag-2a61e13fae4e71c804e96caefd3fdb46f09a81db.zip |
Improve CONTRIBUTING guide
Also:
- update the docker-compose to use Alpine image (lighter)
- update the PHP Dockerfile to use Imagick instead of GD (for GIF support when downloading images) and add support for SQLite
Diffstat (limited to 'docker/php')
-rw-r--r-- | docker/php/Dockerfile | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index b632cb8a..d9b2e5cc 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile | |||
@@ -4,10 +4,25 @@ FROM php:7.2-fpm | |||
4 | ARG timezone='Europe/Paris' | 4 | ARG timezone='Europe/Paris' |
5 | 5 | ||
6 | RUN apt-get update && apt-get install -y \ | 6 | RUN apt-get update && apt-get install -y \ |
7 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng-dev libjpeg-dev \ | 7 | libmcrypt-dev \ |
8 | && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \ | 8 | libicu-dev \ |
9 | && docker-php-ext-install \ | 9 | libpq-dev \ |
10 | iconv mbstring intl pdo pdo_mysql pdo_pgsql gd | 10 | libxml2-dev \ |
11 | libpng-dev \ | ||
12 | libjpeg-dev \ | ||
13 | libsqlite3-dev \ | ||
14 | imagemagick \ | ||
15 | libmagickwand-dev | ||
16 | RUN docker-php-ext-install \ | ||
17 | iconv \ | ||
18 | mbstring \ | ||
19 | intl \ | ||
20 | pdo \ | ||
21 | pdo_mysql \ | ||
22 | pdo_pgsql \ | ||
23 | pdo_sqlite | ||
24 | |||
25 | RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick | ||
11 | 26 | ||
12 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini | 27 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini |
13 | 28 | ||