diff --git a/app-standard-v1.json b/app-standard-v1.json index a5f5254..7603901 100644 --- a/app-standard-v1.json +++ b/app-standard-v1.json @@ -1,11 +1,14 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", - "title": "app.yml specification v1", - "description": "The app.yml format, cleaned up. This format should be used for new apps, but the autoconverter can only convert to v0, so v0 will be kept for some time.", + "title": "Citadel app.yml v1", + "description": "The first draft of Citadel's app.yml format", "type": "object", "properties": { "version": { - "type": ["string", "number"], + "type": [ + "string", + "number" + ], "description": "The version of the app.yml format you're using." }, "metadata": { @@ -111,13 +114,22 @@ "type": "array", "items": { "type": "string", - "enum": ["lnd", "bitcoind", "electrum", "root", "hw"] + "enum": [ + "lnd", + "bitcoind", + "electrum", + "root", + "hw" + ] } }, "ports": { "type": "array", "items": { - "type": ["string", "number"] + "type": [ + "string", + "number" + ] } }, "port": { @@ -125,7 +137,7 @@ "description": "If this is the main container, the port inside the container which will be exposed to the outside as the port specified in metadata." }, "environment": { - "type": ["object", "array"] + "type": "object" }, "data": { "type": "array", @@ -147,7 +159,10 @@ "description": "The services the container depends on" }, "entrypoint": { - "type": ["string", "array"], + "type": [ + "string", + "array" + ], "description": "The entrypoint for the container" }, "bitcoin_mount_dir": { @@ -155,7 +170,10 @@ "description": "Where to mount the bitcoin dir" }, "command": { - "type": ["string", "array"], + "type": [ + "string", + "array" + ], "description": "The command for the container" }, "init": { @@ -183,21 +201,26 @@ "description": "Set this to a map of service names to hidden service ports if your container exposes multiple ports, and all of them should be hidden services.", "patternProperties": { "^[a-zA-Z0-9_]+$": { - "type": ["number", "array"] + "type": [ + "number", + "array" + ] } } }, - "restarts": { + "restart": { "type": "string", "description": "When the container should restart. Can be 'always' or 'on-failure'." } }, "additionalProperties": false }, - "required": ["name", "image"], "additionalProperties": false } }, - "required": ["metadata", "containers"], + "required": [ + "metadata", + "containers" + ], "additionalProperties": false } diff --git a/apps.json b/apps.json index 3752208..28f005c 100644 --- a/apps.json +++ b/apps.json @@ -1,28 +1,4 @@ [ - { - "id": "thunderhub", - "name": "ThunderHub", - "repo": "https://github.com/apotdevin/thunderhub", - "version": "0.12.31" - }, - { - "id": "squeaknode", - "name": "Squeaknode", - "repo": "https://github.com/yzernik/squeaknode", - "version": "0.1.177" - }, - { - "id": "specter-desktop", - "name": "Specter Desktop", - "repo": "https://github.com/cryptoadvance/specter-desktop", - "version": "1.7.1" - }, - { - "id": "krystal-bull", - "name": "Krystal Bull", - "repo": "https://github.com/bitcoin-s/krystal-bull", - "version": "1.7.0-212-d9126650" - }, { "id": "mempool", "name": "Mempool", @@ -30,10 +6,28 @@ "version": "2.3.0-dev1" }, { - "id": "sphinx-relay", - "name": "Sphinx Relay", - "repo": "https://github.com/stakwork/sphinx-relay", - "version": "2.2.3" + "id": "squeaknode", + "name": "Squeaknode", + "repo": "https://github.com/squeaknode/squeaknode", + "version": "0.1.186" + }, + { + "id": "thunderhub", + "name": "ThunderHub", + "repo": "https://github.com/apotdevin/thunderhub", + "version": "0.12.31" + }, + { + "id": "lightning-terminal", + "name": "Lightning Terminal", + "repo": "https://github.com/lightninglabs/lightning-terminal", + "version": "0.6.1-alpha" + }, + { + "id": "vaultwarden", + "name": "Vaultwarden", + "repo": "https://github.com/dani-garcia/vaultwarden", + "version": "1.23.1" }, { "id": "lnme", @@ -42,10 +36,10 @@ "version": "1.4.0" }, { - "id": "vaultwarden", - "name": "Vaultwarden", - "repo": "https://github.com/dani-garcia/vaultwarden", - "version": "1.23.0" + "id": "ride-the-lightning", + "name": "Ride The Lightning", + "repo": "https://github.com/Ride-The-Lightning/RTL", + "version": "0.11.2" }, { "id": "bluewallet", @@ -53,16 +47,34 @@ "repo": "https://github.com/BlueWallet/LndHub", "version": "1.4.1" }, - { - "id": "node-red", - "name": "Node-RED", - "repo": "https://github.com/node-red/node-red", - "version": "2.1.3" - }, { "id": "lnmarkets", "name": "LN Markets", "repo": "https://github.com/ln-markets/umbrel", "version": "1.1.5" + }, + { + "id": "sphinx-relay", + "name": "Sphinx Relay", + "repo": "https://github.com/stakwork/sphinx-relay", + "version": "2.2.3" + }, + { + "id": "krystal-bull", + "name": "Krystal Bull", + "repo": "https://github.com/bitcoin-s/krystal-bull", + "version": "1.7.0-212-d9126650" + }, + { + "id": "specter-desktop", + "name": "Specter Desktop", + "repo": "https://github.com/cryptoadvance/specter-desktop", + "version": "1.7.2" + }, + { + "id": "node-red", + "name": "Node-RED", + "repo": "https://github.com/node-red/node-red", + "version": "2.1.4" } ] \ No newline at end of file diff --git a/apps/apps.json b/apps/apps.json index 3752208..28f005c 100644 --- a/apps/apps.json +++ b/apps/apps.json @@ -1,28 +1,4 @@ [ - { - "id": "thunderhub", - "name": "ThunderHub", - "repo": "https://github.com/apotdevin/thunderhub", - "version": "0.12.31" - }, - { - "id": "squeaknode", - "name": "Squeaknode", - "repo": "https://github.com/yzernik/squeaknode", - "version": "0.1.177" - }, - { - "id": "specter-desktop", - "name": "Specter Desktop", - "repo": "https://github.com/cryptoadvance/specter-desktop", - "version": "1.7.1" - }, - { - "id": "krystal-bull", - "name": "Krystal Bull", - "repo": "https://github.com/bitcoin-s/krystal-bull", - "version": "1.7.0-212-d9126650" - }, { "id": "mempool", "name": "Mempool", @@ -30,10 +6,28 @@ "version": "2.3.0-dev1" }, { - "id": "sphinx-relay", - "name": "Sphinx Relay", - "repo": "https://github.com/stakwork/sphinx-relay", - "version": "2.2.3" + "id": "squeaknode", + "name": "Squeaknode", + "repo": "https://github.com/squeaknode/squeaknode", + "version": "0.1.186" + }, + { + "id": "thunderhub", + "name": "ThunderHub", + "repo": "https://github.com/apotdevin/thunderhub", + "version": "0.12.31" + }, + { + "id": "lightning-terminal", + "name": "Lightning Terminal", + "repo": "https://github.com/lightninglabs/lightning-terminal", + "version": "0.6.1-alpha" + }, + { + "id": "vaultwarden", + "name": "Vaultwarden", + "repo": "https://github.com/dani-garcia/vaultwarden", + "version": "1.23.1" }, { "id": "lnme", @@ -42,10 +36,10 @@ "version": "1.4.0" }, { - "id": "vaultwarden", - "name": "Vaultwarden", - "repo": "https://github.com/dani-garcia/vaultwarden", - "version": "1.23.0" + "id": "ride-the-lightning", + "name": "Ride The Lightning", + "repo": "https://github.com/Ride-The-Lightning/RTL", + "version": "0.11.2" }, { "id": "bluewallet", @@ -53,16 +47,34 @@ "repo": "https://github.com/BlueWallet/LndHub", "version": "1.4.1" }, - { - "id": "node-red", - "name": "Node-RED", - "repo": "https://github.com/node-red/node-red", - "version": "2.1.3" - }, { "id": "lnmarkets", "name": "LN Markets", "repo": "https://github.com/ln-markets/umbrel", "version": "1.1.5" + }, + { + "id": "sphinx-relay", + "name": "Sphinx Relay", + "repo": "https://github.com/stakwork/sphinx-relay", + "version": "2.2.3" + }, + { + "id": "krystal-bull", + "name": "Krystal Bull", + "repo": "https://github.com/bitcoin-s/krystal-bull", + "version": "1.7.0-212-d9126650" + }, + { + "id": "specter-desktop", + "name": "Specter Desktop", + "repo": "https://github.com/cryptoadvance/specter-desktop", + "version": "1.7.2" + }, + { + "id": "node-red", + "name": "Node-RED", + "repo": "https://github.com/node-red/node-red", + "version": "2.1.4" } ] \ No newline at end of file diff --git a/apps/node-red/app.yml b/apps/node-red/app.yml index 82a2e0d..cdea32e 100644 --- a/apps/node-red/app.yml +++ b/apps/node-red/app.yml @@ -5,11 +5,10 @@ # yaml-language-server: $schema=../../app-standard-v1.json version: 1 - metadata: category: Automation name: Node-RED - version: 2.1.3 + version: 2.1.4 tagline: Wire together the Internet of Things description: >- Node-RED is a visual programming tool for wiring together hardware devices, @@ -39,7 +38,7 @@ metadata: torOnly: false containers: - name: web - image: nodered/node-red:2.1.3@sha256:c6c82e6404c88f766e18034148597e59ff593e291622b965ac9c4c7342bb9469 + image: nodered/node-red:2.1.4@sha256:f1fb4f8eec0fcc49ff6edff988da48358dc3c6afe20a927be58a33dff4bbe359 stop_grace_period: 1m data: - data:/data diff --git a/apps/ride-the-lightning/app.yml b/apps/ride-the-lightning/app.yml index dedb43e..9dadd05 100644 --- a/apps/ride-the-lightning/app.yml +++ b/apps/ride-the-lightning/app.yml @@ -53,7 +53,7 @@ containers: - bitcoind - name: loop - image: ghcr.io/runcitadel/loop:v0.15.1-beta@sha256:c8e1d361442675a17a2ec3d7de8f5718db17c9b24e744cd6b89992f97befc904 + image: ghcr.io/runcitadel/loop:v0.16.0-beta@sha256:ee441e73079012f5b8777c744f26fb3fb4b0f5b9485395ab5ca9da80e60fc704 user: 1000:1000 environment: HOME: /data diff --git a/apps/specter-desktop/app.yml b/apps/specter-desktop/app.yml index 90cf0bd..78cd043 100644 --- a/apps/specter-desktop/app.yml +++ b/apps/specter-desktop/app.yml @@ -9,7 +9,7 @@ version: 1 metadata: category: Wallets name: Specter Desktop - version: 1.7.1 + version: 1.7.2 tagline: Multisig with hardware wallets made easy description: >- Specter Desktop connects to the Bitcoin Core running on your Citadel @@ -51,7 +51,7 @@ metadata: - 3.jpg containers: -- image: lncm/specter-desktop:v1.7.1@sha256:e208bd4d9e20eadabaa543ce6093493c9727a6f9a083dd0d3b3d6723f82c4da6 +- image: lncm/specter-desktop:v1.7.2@sha256:78c9287598dc62efe7cbde05e8bb2328bca66b973ba47220f0167868508b503e stop_signal: SIGINT command: - --host=0.0.0.0 diff --git a/apps/squeaknode/app.yml b/apps/squeaknode/app.yml index 2d7fbd0..e152849 100644 --- a/apps/squeaknode/app.yml +++ b/apps/squeaknode/app.yml @@ -8,7 +8,7 @@ version: 1 metadata: category: Social name: Squeaknode - version: 0.1.181 + version: 0.1.186 tagline: A peer-to-peer status feed with Lightning monetization description: >- The Squeaknode app allows you to create, view, buy, and sell squeaks. A @@ -34,7 +34,7 @@ metadata: mainContainer: web containers: - name: web - image: ghcr.io/runcitadel/squeaknode:sha-367f477@sha256:7dc5d24809e13444a0f3e901a041fb2618203cf7081c0b017613e56d8030c03f + image: ghcr.io/squeaknode/squeaknode:v0.1.186@sha256:3dcae780ae5c1707c30b4467a83bcf917768e011ba6693dd86289acb126e7df7 stop_grace_period: 1m port: 12994 ports: diff --git a/apps/vaultwarden/app.yml b/apps/vaultwarden/app.yml index adf62de..26a159e 100644 --- a/apps/vaultwarden/app.yml +++ b/apps/vaultwarden/app.yml @@ -5,55 +5,50 @@ # yaml-language-server: $schema=../../app-standard-v1.json version: 1 - - metadata: category: Password Managers name: Vaultwarden - version: 1.23.0 + version: 1.23.1 tagline: Unofficial Bitwarden® compatible server description: >- - Vaultwarden (formerly known as Bitwarden_RS) is an alternative implementation\ - of the Bitwarden® server API written in Rust, compatible with upstream Bitwarden®\ - clients*. Vaultwarden is perfect for self-hosting all of your passwords in an\ - encrypted vault on your Citadel. Vaultwarden is a full implementation of Bitwarden®\ - API that includes: - + Vaultwarden (formerly known as Bitwarden_RS) is an alternative + implementation\ of the Bitwarden® server API written in Rust, compatible + with upstream Bitwarden®\ clients*. Vaultwarden is perfect for self-hosting + all of your passwords in an\ encrypted vault on your Citadel. Vaultwarden is + a full implementation of Bitwarden®\ API that includes: + - Organizations support - + - Attachments - + - Vault API support - Serving the static files for Vault interface - + - Website icons API - + - Authenticator and U2F support - + - YubiKey and Duo support - - - Please note that Vaultwarden is not associated with the Bitwarden® project nor 8bit Solutions LLC. - When using this app, please report any bugs or suggestions to us directly, regardless - of whatever clients you are using (mobile, desktop, browser, etc), and do not - use Bitwarden®'s official support channels. + + + Please note that Vaultwarden is not associated with the Bitwarden® project nor 8bit Solutions LLC. When using this app, please report any bugs or suggestions to us directly, regardless of whatever clients you are using (mobile, desktop, browser, etc), and do not use Bitwarden®'s official support channels. developer: Daniel García website: https://github.com/dani-garcia dependencies: [] repo: https://github.com/dani-garcia/vaultwarden support: https://vaultwarden.discourse.group/ gallery: - - 1.jpg - - 2.jpg - - 3.jpg + - 1.jpg + - 2.jpg + - 3.jpg torOnly: true containers: -- image: vaultwarden/server:1.23.0@sha256:2b222cce85a97624b30fb1ff228f609ec5b43dd182357f80239834a1ada3aa38 - user: 1000:1000 - port: 3000 - environment: - ROCKET_PORT: 3000 - name: server - data: - - data:/data + - image: vaultwarden/server:1.23.1@sha256:08d8edab2311ee36de9f1e2dd7f6ae18680a7fcbf00bab98d63fd4ff82b285e2 + user: 1000:1000 + port: 3000 + environment: + ROCKET_PORT: 3000 + name: server + data: + - data:/data