diff --git a/blueprints/rsshub/docker-compose.yml b/blueprints/rsshub/docker-compose.yml new file mode 100644 index 00000000..cd36d6c8 --- /dev/null +++ b/blueprints/rsshub/docker-compose.yml @@ -0,0 +1,50 @@ +services: + rsshub: + # two ways to enable puppeteer: + # * comment out marked lines, then use this image instead: diygod/rsshub:chromium-bundled + # * (consumes more disk space and memory) leave everything unchanged + image: diygod/rsshub + restart: always + ports: + - 1200 + environment: + NODE_ENV: production + CACHE_TYPE: redis + REDIS_URL: "redis://redis:6379/" + PUPPETEER_WS_ENDPOINT: "ws://browserless:3000" # marked + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:1200/healthz"] + interval: 30s + timeout: 10s + retries: 3 + depends_on: + - redis + - browserless # marked + + browserless: # marked + image: browserless/chrome # marked + restart: always # marked + ulimits: # marked + core: # marked + hard: 0 # marked + soft: 0 # marked + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:3000/pressure"] + interval: 30s + timeout: 10s + retries: 3 + + redis: + image: redis:alpine + restart: always + volumes: + - redis-data:/data + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 30s + timeout: 10s + retries: 5 + start_period: 5s + +volumes: + redis-data: \ No newline at end of file diff --git a/blueprints/rsshub/rsshub.png b/blueprints/rsshub/rsshub.png new file mode 100644 index 00000000..24fa336b Binary files /dev/null and b/blueprints/rsshub/rsshub.png differ diff --git a/blueprints/rsshub/template.toml b/blueprints/rsshub/template.toml new file mode 100644 index 00000000..d2162157 --- /dev/null +++ b/blueprints/rsshub/template.toml @@ -0,0 +1,8 @@ +[variables] +main_domain = "${domain}" + +[config] +[[config.domains]] +serviceName = "rsshub" +port = 1200 +host = "${main_domain}" diff --git a/blueprints/vaultwarden/docker-compose.yml b/blueprints/vaultwarden/docker-compose.yml index 19cd6f81..a642945d 100644 --- a/blueprints/vaultwarden/docker-compose.yml +++ b/blueprints/vaultwarden/docker-compose.yml @@ -1,13 +1,14 @@ +# the webserver can take a while to start up, so don't be alarmed if it takes a few minutes to get a response services: vaultwarden: - image: vaultwarden/server:1.32.7 + image: vaultwarden/server:1.33.2 restart: always environment: DOMAIN: ${DOMAIN} SIGNUPS_ALLOWED: ${SIGNUPS_ALLOWED} volumes: - vaultwarden:/data - ports: + expose: - 80 volumes: diff --git a/meta.json b/meta.json index 508e2775..c3c7567a 100644 --- a/meta.json +++ b/meta.json @@ -799,7 +799,7 @@ { "id": "vaultwarden", "name": "Vaultwarden", - "version": "1.32.7", + "version": "1.33.2", "description": "Unofficial Bitwarden compatible server written in Rust, formerly known as bitwarden_rs", "logo": "vaultwarden.svg", "links": { @@ -2632,5 +2632,22 @@ "community", "privacy" ] + }, + { + "id": "rsshub", + "name": "RSSHub", + "version": "1.0.0", + "description": "RSSHub is the world's largest RSS network, consisting of over 5,000 global instances.RSSHub delivers millions of contents aggregated from all kinds of sources, our vibrant open source community is ensuring the deliver of RSSHub's new routes, new features and bug fixes.", + "logo": "rsshub.png", + "links": { + "github": "https://github.com/DIYgod/RSSHub", + "website": "https://rsshub.app/", + "docs": "https://docs.rsshub.app/" + }, + "tags": [ + "rss", + "api", + "self-hosted" + ] } ]