Merge branch 'dev' into master

2018-01-02 08:46:33 +13:00
parent f03778866c a0113f4441
commit 9bccc66beb
10540 changed files with 573798 additions and 365039 deletions
--- a/docker-compose-armhf.yml
+++ b/docker-compose-armhf.yml
@@ -37,3 +37,13 @@ services:
    - "8080:8080"
  volumes:
    - /etc/localtime:/etc/localtime:ro
+
+ rss:
+  build:
+     context: ./plugins/rss
+     dockerfile: Dockerfile.armhf
+  image: haugene/rpi-transmission-plugin-rss
+  links:
+    - transmission
+  environment:
+    - RSS_URL=http://.../xxxxx.rss