diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-07-21 12:49:29 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-07-21 12:49:29 +0200 |
| commit | 0a297addc060692f163c2614aa9989f5840f494a (patch) | |
| tree | 30d0b543cfaf0b9f6897a8db049b59d82e0030f6 | |
| parent | 9623665913ab997e023edf13df9cf97b13fdae30 (diff) | |
Add php-gmp for API in Ubuntu 32-bit (#2450)
And adjust slightly the HEALTHCHECK parameters for faster start in
Træfik
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile | 4 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a29ea841c..ade2b2438 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Make CGI Authorization configuration for API more compatible [#2446](https://github.com/FreshRSS/FreshRSS/issues/2446) * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) + * Docker: Add `php-gmp` for API support in Ubuntu 32-bit [#2450](https://github.com/FreshRSS/FreshRSS/pull/2450) * UI * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index eea2ea49c..1eac3687b 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && \ apt install --no-install-recommends -y \ ca-certificates cron curl \ apache2 libapache2-mod-php \ - php-curl php-intl php-mbstring php-xml php-zip \ + php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/* @@ -55,5 +55,5 @@ CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ exec apache2 -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 4078ad0cb..1715ff778 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -52,5 +52,5 @@ EXPOSE 80 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ exec httpd -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index fb136e34e..87a807350 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -13,7 +13,7 @@ RUN apt update && \ apt install --no-install-recommends -y \ ca-certificates cron curl \ apache2 libapache2-mod-php \ - php-curl php-intl php-mbstring php-xml php-zip \ + php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ rm -rf /var/lib/apt/lists/* @@ -67,5 +67,5 @@ CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ exec apache2 -D FOREGROUND -HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ +HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 |