diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2018-03-09 10:58:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2018-03-09 10:58:43 +0100 |
| commit | 029f4107123f6c318584bf9a43da7118c318657f (patch) | |
| tree | 5dfd5cae38d1da0bc747027b192fed650bda15fd | |
| parent | f0fd273199682881b805e968ca36df4ccdbfa7a1 (diff) | |
| parent | 1e4cc18bef238fd19e0ce3f9524af2b00b570ade (diff) | |
Merge pull request #1827 from FreshRSS/dev1.10.2
FreshRSS 1.10.2 (only a Docker fix)
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | constants.php | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e855e1acb..501bff9c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # FreshRSS changelog +## 2018-03-09 FreshRSS 1.10.2 (Docker only) + +* Bug fixing + * Fix Docker image for OPML import [#1819](https://github.com/FreshRSS/FreshRSS/pull/1819) + * Fix Docker image for CSS selectors [#1821](https://github.com/FreshRSS/FreshRSS/issues/1821) + * Fix Docker other missing PHP extensions [#1822](https://github.com/FreshRSS/FreshRSS/pull/1822) + + ## 2018-03-04 FreshRSS 1.10.1 * Deployment diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 993dcea31..9b7336e3b 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.7 RUN apk add --no-cache \ apache2 php7-apache2 \ php7 php7-curl php7-gmp php7-intl php7-mbstring php7-xml php7-zip \ - php7-ctype php7-dom php7-fileinfo php7-json php7-session \ + php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session php7-simplexml php7-xmlreader php7-zlib \ php7-pdo_sqlite \ php7-pdo_mysql \ php7-pdo_pgsql diff --git a/constants.php b/constants.php index e0a271ee8..188560eb5 100644 --- a/constants.php +++ b/constants.php @@ -2,7 +2,7 @@ //NB: Do not edit; use ./constants.local.php instead. //<Not customisable> -define('FRESHRSS_VERSION', '1.10.1'); +define('FRESHRSS_VERSION', '1.10.2'); define('FRESHRSS_WEBSITE', 'https://freshrss.org'); define('FRESHRSS_WIKI', 'https://freshrss.github.io/FreshRSS/'); |