From c1a1c46e9ddc492606af9af82f1c4054e2c5ac20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?= Date: Thu, 23 May 2019 08:51:54 +0200 Subject: Force PHP version in Dockerfile --- docker/php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d0266ec7..b632cb8a 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:fpm +FROM php:7.2-fpm # Default timezone. To change it, use the argument in the docker-compose.yml file ARG timezone='Europe/Paris' -- cgit v1.2.3 From 2a61e13fae4e71c804e96caefd3fdb46f09a81db Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 19 Jun 2019 14:54:38 +0200 Subject: 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 --- docker/php/Dockerfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'docker') 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 ARG timezone='Europe/Paris' RUN apt-get update && apt-get install -y \ - libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng-dev libjpeg-dev \ - && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \ - && docker-php-ext-install \ - iconv mbstring intl pdo pdo_mysql pdo_pgsql gd + libmcrypt-dev \ + libicu-dev \ + libpq-dev \ + libxml2-dev \ + libpng-dev \ + libjpeg-dev \ + libsqlite3-dev \ + imagemagick \ + libmagickwand-dev +RUN docker-php-ext-install \ + iconv \ + mbstring \ + intl \ + pdo \ + pdo_mysql \ + pdo_pgsql \ + pdo_sqlite + +RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini -- cgit v1.2.3 From 0deec4082f529a744869c0098d2e909fbb057efc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 6 Jul 2019 22:03:40 +0200 Subject: Add missing tidy extension on Docker It's required in the 2.4 version --- docker/php/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d9b2e5cc..ffdf33c9 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get update && apt-get install -y \ libjpeg-dev \ libsqlite3-dev \ imagemagick \ - libmagickwand-dev + libmagickwand-dev \ + libtidy-dev RUN docker-php-ext-install \ iconv \ mbstring \ @@ -20,7 +21,8 @@ RUN docker-php-ext-install \ pdo \ pdo_mysql \ pdo_pgsql \ - pdo_sqlite + pdo_sqlite \ + tidy RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick -- cgit v1.2.3 From 2068b4458d647cae965bde150b79f8bc28d3eba7 Mon Sep 17 00:00:00 2001 From: adev Date: Sun, 27 Oct 2019 19:04:04 +0100 Subject: Add package and PHP extension to PHP docker --- docker/php/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index ffdf33c9..c43e07fd 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -13,16 +13,21 @@ RUN apt-get update && apt-get install -y \ libsqlite3-dev \ imagemagick \ libmagickwand-dev \ - libtidy-dev + libtidy-dev \ + git RUN docker-php-ext-install \ iconv \ mbstring \ + gd \ intl \ pdo \ pdo_mysql \ pdo_pgsql \ pdo_sqlite \ - tidy + sockets \ + tidy \ + bcmath \ + zip RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick -- cgit v1.2.3 From 64885da458d6c3a57883393f3d924c1a7c245284 Mon Sep 17 00:00:00 2001 From: adev Date: Sun, 27 Oct 2019 19:25:47 +0100 Subject: Increase php memory limit PHP Docker --- docker/php/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker') diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index ffdf33c9..43e3cc5f 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -2,6 +2,7 @@ FROM php:7.2-fpm # Default timezone. To change it, use the argument in the docker-compose.yml file ARG timezone='Europe/Paris' +ARG memorylimit='512M' RUN apt-get update && apt-get install -y \ libmcrypt-dev \ @@ -27,6 +28,7 @@ RUN docker-php-ext-install \ RUN printf "\n" | pecl install imagick && docker-php-ext-enable imagick RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini +RUN echo "memory_limit ="$memorylimit > /usr/local/etc/php/conf.d/memory_limit.ini RUN usermod -u 1000 www-data -- cgit v1.2.3 From 5a071f29b794011118aaa6239b8cb7041439d825 Mon Sep 17 00:00:00 2001 From: James Nelson Date: Mon, 30 Dec 2019 14:29:20 -0600 Subject: Fix broken ENV file - removed "export"s --- docker/postgres/env | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/postgres/env b/docker/postgres/env index 80c78c2a..a58aa774 100644 --- a/docker/postgres/env +++ b/docker/postgres/env @@ -1,9 +1,9 @@ POSTGRES_USER=wallabag POSTGRES_PASSWORD=wallapass POSTGRES_DB=wallabag -export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql -export SYMFONY__ENV__DATABASE_HOST=rdbms -export SYMFONY__ENV__DATABASE_PORT=5432 -export SYMFONY__ENV__DATABASE_NAME=wallabag -export SYMFONY__ENV__DATABASE_USER=wallabag -export SYMFONY__ENV__DATABASE_PASSWORD=wallapass +SYMFONY__ENV__DATABASE_HOST=rdbms +SYMFONY__ENV__DATABASE_PORT=5432 +SYMFONY__ENV__DATABASE_NAME=wallabag +SYMFONY__ENV__DATABASE_USER=wallabag +SYMFONY__ENV__DATABASE_PASSWORD=wallapass +SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql \ No newline at end of file -- cgit v1.2.3 From 0ca270f38507e788de1a10dbede743a47e4258a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?= Date: Tue, 31 Dec 2019 09:19:02 +0100 Subject: Update env --- docker/postgres/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/postgres/env b/docker/postgres/env index a58aa774..0dd1adb3 100644 --- a/docker/postgres/env +++ b/docker/postgres/env @@ -6,4 +6,4 @@ SYMFONY__ENV__DATABASE_PORT=5432 SYMFONY__ENV__DATABASE_NAME=wallabag SYMFONY__ENV__DATABASE_USER=wallabag SYMFONY__ENV__DATABASE_PASSWORD=wallapass -SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql \ No newline at end of file +SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql -- cgit v1.2.3