follow the updates on dev branch

Author: RoyXiang

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:edge
 MAINTAINER Roy Xiang <[email protected]>
 
 ENV LANG C.UTF-8
@@ -8,18 +8,12 @@ RUN apk add --update --no-cache ca-certificates
 RUN set -ex \
         && apk add --no-cache --virtual .run-deps \
                 ffmpeg \
-                freetype \
-                lcms2 \
-                libjpeg-turbo \
                 libmagic \
-                openblas \
-                openjpeg \
                 python3 \
                 py3-certifi \
+                py3-numpy \
+                py3-pillow \
                 py3-requests \
-                tiff \
-                libwebp \
-                zlib \
         && ln -sf "$(python3 -c 'import requests; print(requests.__path__[0])')/cacert.pem" \
                   "$(python3 -c 'import certifi; print(certifi.__path__[0])')/cacert.pem"
 
@@ -36,22 +30,8 @@ RUN set -ex \
         && apk del .fetch-deps
 
 RUN set -ex \
-        && apk add --no-cache --virtual .build-deps \
-                freetype-dev \
-                lcms2-dev \
-                libjpeg-turbo-dev \
-                musl-dev \
-                openblas-dev \
-                openjpeg-dev \
-                python3-dev \
-                tiff-dev \
-                libwebp-dev \
-                zlib-dev \
-        && ln -s /usr/include/locale.h /usr/include/xlocale.h \
         && pip3 install -r /opt/ehForwarderBot/requirements.txt \
-        && rm /usr/include/xlocale.h \
-        && rm -rf /root/.cache \
-        && apk del .build-deps
+        && rm -rf /root/.cache
 
 WORKDIR /opt/ehForwarderBot
 

README.md

@@ -1,9 +1,34 @@
-Unofficial Docker image for [EH Forwarder Bot](https://github.com/blueset/ehForwarderBot). Maintained by [Roy Xiang](http://github.com/RoyXiang). Included all officialy maintained channels, updated with the latest master branch.
+Unofficial Docker image for [EH Forwarder Bot](https://github.com/blueset/ehForwarderBot). Maintained by [Roy Xiang](http://github.com/RoyXiang). Included all officialy maintained channels.
+
+# Supported tags and respective `Dockerfile` links
+
+* `latest` ([Dockerfile](https://github.com/RoyXiang/docker-EFB/blob/master/Dockerfile))
+* `dev` ([Dockerfile](https://github.com/RoyXiang/docker-EFB/blob/dev/Dockerfile))
 
 # Get Started
 
+Make sure you have `config.py` in the current working directory.
+
+If you use Telegram as your master channel and do not have a `tgdata.db` backuped. You need to create one first:
+
+```
+$ touch tgdata.db
+```
+
+Then start a docker container by the following command:
+
+```
+$ docker run -d --restart=always \
+        --name=ehforwarderbot \
+        -v $(pwd)/config.py:/opt/ehForwarderBot/config.py \
+        -v $(pwd)/tgdata.db:/opt/ehForwarderBot/plugins/eh_telegram_master/tgdata.db \
+        royx/docker-efb
+```
+
+If an interactive process is needed for authentication (like WeChat), check it in docker logs:
+
 ```
-$ docker run -v config.py:/opt/ehForwarderBot/config.py -v tgdata.db:/opt/ehForwarderBot/plugins/eh_telegram_master/tgdata.db royx/docker-efb
+$ docker logs ehforwarderbot
 ```
 
 # Volumes