Commit Graph

17 Commits

Author SHA1 Message Date
jandrews377
9bccc66beb Merge branch 'dev' into master 2018-01-02 08:46:33 +13:00
Jeremy Andrews
ef66e85f34 tweaks 2018-01-01 13:38:25 +13:00
Bruno Perel
4e6e8511b8 Use separate container for the RSS plugin 2017-12-03 01:47:47 +01:00
Kristian Haugene
7a5f19015b Another merge error, wtf 2017-10-13 21:23:24 +02:00
Jordan Heemskerk
ebc0b15bbd docker-compose.yml: remove quotes 2017-07-16 11:50:51 -07:00
jandrews377
0877052a13 Merge branch 'master' into master 2017-06-23 10:00:11 +12:00
Jeremy Andrews
af699006c7 Tidied up the tinyproxy integration and added env vars and documentation 2017-06-17 15:09:17 +12:00
Kurs Developer
79ee2358f6 remove quotes 2017-04-02 22:16:10 +02:00
Aaron Wood
d225283321 Reduce the amount of privileges needed 2017-03-05 21:04:50 -05:00
Patrick Kishino
7b35432d17 Updated compose files to match documentation and fix #162 2016-11-16 14:44:41 +01:00
Kristian Haugene
6c7a5bfae9 updating compose file with ports for use with LOCAL_NETWORK 2016-06-06 22:31:08 +02:00
Kristian Haugene
78690b53c9 Updated readme and compose file with new proxy image 2016-05-14 00:28:38 +02:00
Kristian Haugene
43099d6800 Made proxy container with templated config 2016-05-13 23:51:47 +02:00
Trent Summerfield
c6cf9b71db Add a link from nginx to openvpn in docker-compose
I had some trouble getting nginx to reverse-proxy to transmission using my local IP address. The solution in the end was to add a link from the nginx container to the openvpn container. This causes docker-compose to map the name 'openvpn' to the IP address of the actual container at start up.

This would also allow you to include a portable nginx.conf file in the repository that didn't require the user to change anything. Let me know if you would like me to open a second pull request adding a copy of my nginx.conf that works with this.
2016-03-09 19:03:46 +11:00
Kristian Haugene
2364ddb2e9 example docker-compose.yml file 2015-08-15 17:43:12 +02:00
Kristian Haugene
d0dae40148 used locally only 2015-08-08 01:14:58 +02:00
Kristian Haugene
91ccd7e3dd modified startup scripts to support more vpn providers 2015-08-07 23:07:55 +02:00