Merge pull request #132 from wallabag/release-2.3.4

2.3.4
wallabag · Nov 24, 2018 · 25bf471 · 25bf471
2 parents e741136 + 0cee047
commit 25bf471
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:latest
 
 LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"
 
-ARG WALLABAG_VERSION=2.3.3
+ARG WALLABAG_VERSION=2.3.4
 
 RUN set -ex \
  && apk update \
@@ -37,6 +37,8 @@ RUN set -ex \
       php7-tokenizer \
       php7-xml \
       php7-zlib \
+      php7-sockets \
+      php7-xmlreader \
       py-mysqldb \
       py-psycopg2 \
       py-simplejson \

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ Default login is `wallabag:wallabag`.
 - `-e SYMFONY__ENV__DATABASE_PASSWORD=...` (defaults to "~", this is the password of the database user to use)
 - `-e SYMFONY__ENV__DATABASE_CHARSET=...` (defaults to utf8, this is the database charset to use)
 - `-e SYMFONY__ENV__SECRET=...` (defaults to "ovmpmAWXRCabNlMgzlzFXDYmCFfzGv")
-- `-e SYMFONY__ENV__MAILER_HOST=...`  defaults to "127.0.0.1", the SMTP host)
+- `-e SYMFONY__ENV__MAILER_HOST=...`  (defaults to "127.0.0.1", the SMTP host)
 - `-e SYMFONY__ENV__MAILER_USER=...` (defaults to "~", the SMTP user)
 - `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password)
 - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "wallabag@example.com", the address wallabag uses for outgoing emails)