From 1b61a07c5543809f70bdccfabc598e53d9c8d590 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Fri, 18 Jan 2019 00:51:36 +0530
Subject: [PATCH] Updates RSS Bridge
---
providers.tf | 9 +++++++++
rss-bridge.tf | 34 ++++++++++++++++------------------
modules/container/main.tf | 2 ++
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/providers.tf b/providers.tf
index 136a007..95afb20 100644
--- a/providers.tf
+++ a/providers.tf
@@ -1,6 +1,13 @@
provider "docker" {
host = "tcp://docker.vpn.bb8.fun:2376"
- cert_path = "./secrets"
+ cert_path = "./secrets/tatooine"
+ version = "~> 2.0.0"
+}
+
+provider "docker" {
+ host = "tcp://dovpn.vpn.bb8.fun:2376"
+ cert_path = "./secrets/sydney"
+ alias = "sydney"
version = "~> 2.0.0"
}
diff --git a/rss-bridge.tf b/rss-bridge.tf
index cf9333a..fb4542f 100644
--- a/rss-bridge.tf
+++ a/rss-bridge.tf
@@ -1,36 +1,22 @@
module "rss-bridge" {
name = "rss-bridge"
source = "modules/container"
- image = "rssbridge/rss-bridge:latest"
+ image = "captn3m0/rss-bridge:sec-filings"
+
web {
expose = true
host = "rss-bridge.${var.root-domain}"
}
- networks = "${list(module.docker.traefik-network-id)}"
+ networks = ["${data.docker_network.bridge.id}"]
- # files = ["/app/public/whitelist.txt"]
+ volumes = [{
+ container_path = "/app/public/whitelist.txt"
+ host_path = "/mnt/xwing/config/rss-bridge/whitelist.txt"
+ }]
+}
- # contents = [
- # <<EOF
- # AmazonBridge
- # BandcampBridge
- # ContainerLinuxReleasesBridge
- # DiscogsBridge
- # FDroidBridge
- # FacebookBridge
- # GithubIssueBridge
- # GithubSearchBridge
- # GoComicsBridge
- # GoogleSearchBridge
- # InstagramBridge
- # ReadComicsBridge
- # SoundcloudBridge
- # SteamBridge
- # StripeAPIChangeLogBridge
- # AmazonPriceTrackerBridge
- # EOF
- # ,
- # ]
+data "docker_network" "bridge" {
+ name = "bridge"
}
diff --git a/modules/container/main.tf b/modules/container/main.tf
index ca92672..451c1b6 100644
--- a/modules/container/main.tf
+++ a/modules/container/main.tf
@@ -21,6 +21,8 @@
entrypoint = "${var.entrypoint}"
user = "${var.user}"
+ network_mode = "bridge"
+
// Only attach the traefik network if
// service is exposed to the web
networks = ["${concat(var.networks,split(",",lookup(var.web, "expose", "false") == "false" ? "" :"${data.docker_network.traefik.id}"))}"]
--
rgit 0.1.5