aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-03-04 17:08:28 +0100
committerGravatar GitHub <noreply@github.com> 2018-03-04 17:08:28 +0100
commit10d97a743fccf7afa7942e6ca34dc95be9d6f8ca (patch)
tree255af42e21c83819071aa42869489de480e78a66
parent22229ce6a70f5533482ef78ed11e3f9437203600 (diff)
parent80b85ffb8e61f58e0c2517ab3e284b7be82f7e4e (diff)
Merge pull request #1819 from Alkarex/docker-opml
Docker add simplexml
-rw-r--r--CHANGELOG.md3
-rw-r--r--Docker/Dockerfile2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ca9b2733..8f6129daf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
## 2018-0X-XX FreshRSS 1.10.2-dev
+* Bug fixing
+ * Fix Docker image for OPML import [#1819](https://github.com/FreshRSS/FreshRSS/pull/1819)
+
## 2018-03-04 FreshRSS 1.10.1
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 993dcea31..7595923d4 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-json php7-session php7-simplexml \
php7-pdo_sqlite \
php7-pdo_mysql \
php7-pdo_pgsql