Merge branch 'v4-tmpl' into v4-stable

This commit is contained in:
Aaron Dewes 2022-08-24 13:50:31 +02:00
commit 45781a4e9f
21 changed files with 253 additions and 116 deletions

5
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"recommendations": [
"samuelcolvin.jinjahtml"
]
}

View File

@ -4,7 +4,7 @@ version: 3
metadata:
category: Payments
name: BitcartCC
version: 0.6.5.1
version: 0.6.9.1
tagline: BitcartCC is a self-hosted payment processor and developer solutions
platform for cryptocurrencies
description: BitcartCC provides light-weight, but secure and easy-to-use
@ -17,6 +17,9 @@ metadata:
- 1.png
- 2.png
- 3.png
dependencies:
- electrum
path: /help/
containers:
- name: admin
restart: unless-stopped
@ -24,7 +27,11 @@ containers:
command: yarn start
environment:
BITCART_ADMIN_LOG_FILE: bitcart.log
BITCART_ADMIN_API_URL: http://$APP_BITCARTCC_BACKEND_IP:8000
BITCART_ADMIN_API_URL: http://$APP_DOMAIN:$APP_BITCARTCC_MAIN_PORT/api
BITCART_ADMIN_ROOTPATH: /admin
BITCART_ADMIN_SOCKS_PROXY: socks5h://$TOR_PROXY_IP:$TOR_PROXY_PORT
BITCART_ADMIN_ONION_API_URL: http://$APP_HIDDEN_SERVICE/api
BITCART_ADMIN_ONION_HOST: http://$APP_HIDDEN_SERVICE
- name: backend
depends_on:
- bitcoin
@ -32,36 +39,41 @@ containers:
- redis
restart: unless-stopped
image: bitcartcc/bitcart:stable
entrypoint: /usr/local/bin/docker-entrypoint.sh
command: bash -c "alembic upgrade head && gunicorn -c gunicorn.conf.py main:app"
environment:
IN_DOCKER: false
LOG_FILE: bitcart.log
BITCART_DATADIR: /datadir
BITCART_BACKUPS_DIR: /backups
BITCART_VOLUMES: /datadir /backups
BTC_NETWORK: $BITCOIN_NETWORK
BTC_LIGHTNING: true
REDIS_HOST: redis://$APP_BITCARTCC_REDIS_IP
DB_HOST: $APP_BITCARTCC_DATABASE_IP
user: 1000:1000
BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
BITCART_BACKEND_ROOTPATH: /api
data:
- data/bitcart:/datadir
- data/backups:/backups
- name: bitcoin
restart: unless-stopped
image: bitcartcc/bitcart-btc:stable
environment:
BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
BTC_NETWORK: $BITCOIN_NETWORK
BTC_LIGHTNING: true
IN_DOCKER: false
BTC_SERVER: $ELECTRUM_IP:$ELECTRUM_PORT:t
data:
- data/bitcoin:/data
- name: database
restart: unless-stopped
image: postgres:12-alpine
image: ghcr.io/runcitadel/postgres:main@sha256:8f25afe966a63fd3f11a1052e73f30b9de5ddc0876bebaaf944d485374c73c01
environment:
POSTGRES_DB: bitcart
POSTGRES_HOST_AUTH_METHOD: trust
data:
- data/postgres:/var/lib/postgresql/data
user: 1000:1000
- name: redis
restart: unless-stopped
image: redis:alpine
@ -70,28 +82,35 @@ containers:
image: bitcartcc/bitcart-store:stable
command: yarn start
environment:
BITCART_STORE_API_URL: http://$APP_BITCARTCC_BACKEND_IP:8000
BITCART_STORE_API_URL: http://$APP_DOMAIN:$APP_BITCARTCC_MAIN_PORT/api
BITCART_STORE_SOCKS_PROXY: socks5h://$TOR_PROXY_IP:$TOR_PROXY_PORT
BITCART_STORE_ONION_API_URL: http://$APP_HIDDEN_SERVICE/api
BITCART_STORE_ONION_HOST: http://$APP_HIDDEN_SERVICE
user: 1000:1000
- name: worker
depends_on:
- backend
restart: unless-stopped
image: bitcartcc/bitcart:stable
entrypoint: /usr/local/bin/docker-entrypoint.sh
command: python3 worker.py
environment:
IN_DOCKER: false
LOG_FILE: bitcart.log
BITCART_DATADIR: /datadir
BITCART_BACKUPS_DIR: /backups
BITCART_VOLUMES: /datadir /backups
BTC_NETWORK: $BITCOIN_NETWORK
BTC_LIGHTNING: true
REDIS_HOST: redis://$APP_BITCARTCC_REDIS_IP
DB_HOST: $APP_BITCARTCC_DATABASE_IP
user: 1000:1000
BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
data:
- data/bitcart:/datadir
- data/backups:/backups
- image: nginx:1.21.3-alpine@sha256:1ff1364a1c4332341fc0a854820f1d50e90e11bb0b93eb53b47dc5e10c680116
init: true
port: 80
name: main
data:
- nginx/nginx.conf:/etc/nginx/nginx.conf
- nginx/html:/usr/share/nginx/html/help

View File

View File

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>BitcartCC</title>
<link rel="stylesheet" type="text/css" href="pico.min.css" />
</head>
<body>
<main class="container container-fluid">
<h1>Welcome to BitcartCC!</h1>
<ul>
<li><a href="/">Access your store</a></li>
<li><a href="/admin">Access your admin panel</a></li>
<li><a href="/api/">Merchants API</a></li>
<li>
<a target="_blank" rel="noopener noreferrer"
href="https://docs.bitcartcc.com/bitcartcc-basics/walkthrough">BitcartCC Walkthrough</a>
</li>
</ul>
</main>
</body>
</html>

File diff suppressed because one or more lines are too long

View File

@ -19,6 +19,24 @@ http {
default_type application/octet-stream;
# If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
# Connection header that may have been passed to this server
map $http_upgrade $proxy_connection {
default upgrade;
'' close;
}
# Apply fix for very long server names
server_names_hash_bucket_size 128;
# Prevent Nginx Information Disclosure
server_tokens off;
gzip on;
gzip_min_length 1000;
gzip_types image/svg+xml text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $proxy_connection;
server {
listen 80;
@ -30,11 +48,14 @@ http {
proxy_pass http://admin:4000;
}
location /help {
include /etc/nginx/mime.types;
root /usr/share/nginx/html;
index index.html;
}
location / {
proxy_pass http://store:3000/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://store:3000;
}
}
}

View File

@ -1,53 +1,43 @@
# SPDX-FileCopyrightText: 2021 Citadel and contributors
# SPDX-FileCopyrightText: Citadel and contributors
#
# SPDX-License-Identifier: AGPL-3.0-or-later
# SPDX-License-Identifier: AGPL-3.0-only
# yaml-language-server: $schema=../../app-standard-v3.yml
# yaml-language-server: $schema=../../app-standard-v4.yml
citadel_version: 4
version: 3
metadata:
category: Payments
name: BTCPay Server
version: 1.6.1
version: 1.6.9
tagline: Accept Bitcoin payments. Free, open-source & self-hosted, Bitcoin
payment processor.
description: "BTCPay Server is a free and open-source Bitcoin payment processor
which allows you to accept bitcoin without fees or intermediaries. "
developers:
BTCPay Server Foundation: https://btcpayserver.org
dependencies:
permissions:
{% if services is containing("lnd") %}
- lnd
{% elif services is containing("c-lightning") %}
- c-lightning
{% else %}
- - lnd
- c-lightning
{% endif %}
- bitcoind
repo: https://github.com/btcpayserver/btcpayserver
repo:
Public: https://github.com/btcpayserver/btcpayserver
support: https://chat.btcpayserver.org
gallery:
- 1.jpg
- 2.jpg
- 3.jpg
containers:
- name: nbxplorer
image: nicolasdorier/nbxplorer:2.3.19@sha256:f12c8fddef6a8a1faf2ad16e0b0e0120e85520695f6b6c2dd55d61461dce0bb6
user: 1000:1000
environment:
NBXPLORER_DATADIR: /data
NBXPLORER_NETWORK: $BITCOIN_NETWORK
NBXPLORER_PORT: 32838
NBXPLORER_BIND: 0.0.0.0
NBXPLORER_CHAINS: btc
NBXPLORER_SIGNALFILEDIR: /data
NBXPLORER_BTCRPCURL: http://$BITCOIN_IP:$BITCOIN_RPC_PORT
NBXPLORER_BTCNODEENDPOINT: $BITCOIN_IP:$BITCOIN_P2P_PORT
NBXPLORER_BTCRPCUSER: $BITCOIN_RPC_USER
NBXPLORER_BTCRPCPASSWORD: $BITCOIN_RPC_PASS
NBXPLORER_POSTGRES: User
ID=postgres;Host=$APP_BTCPAY_SERVER_POSTGRES_IP;Port=5432;Application
Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer${BITCOIN_NETWORK}
NBXPLORER_AUTOMIGRATE: 1
NBXPLORER_NOMIGRATEEVTS: 1
data:
- data/nbxplorer:/data
- name: main
image: btcpayserver/btcpayserver:1.6.1@sha256:cd49abe1f5f82faf59522a569abe2e7db400d4270eb37845f8947e38543bbae0
services:
main:
port: 3000
image: btcpayserver/btcpayserver:1.6.9@sha256:1162bb6231cbdf0a8297107951afe8a44c60a86814d07454f24b4ccf05ba1f71
depends_on:
- nbxplorer
- postgres
@ -63,19 +53,54 @@ containers:
ID=postgres;Host=$APP_BTCPAY_SERVER_POSTGRES_IP;Port=5432;Application
Name=btcpayserver;Database=btcpayserver$BITCOIN_NETWORK
BTCPAY_NETWORK: $BITCOIN_NETWORK
BTCPAY_BIND: 0.0.0.0:$APP_BTCPAY_SERVER_MAIN_PORT
BTCPAY_BIND: 0.0.0.0:3000
BTCPAY_CHAINS: btc
BTCPAY_BTCEXPLORERURL: http://$APP_BTCPAY_SERVER_NBXPLORER_IP:32838
{% if services is containing("lnd") %}
BTCPAY_BTCLIGHTNING: type=lnd-rest;server=https://$LND_IP:$LND_REST_PORT/;macaroonfilepath=/lnd/data/chain/bitcoin/$BITCOIN_NETWORK/admin.macaroon;allowinsecure=true
{% elif services is containing("c-lightning") %}
BTCPAY_BTCLIGHTNING: type=clightning;server=unix://c-lightning/bitcoin/lightning-rpc
{%endif %}
BTCPAY_SOCKSENDPOINT: $TOR_PROXY_IP:$TOR_PROXY_PORT
data:
- data/nbxplorer:/data/.nbxplorer
- data/btcpay:/data
mounts:
{% if services is containing("lnd") %}
lnd: /lnd
{% elif services is containing("c-lightning") %}
c_lightning: /c-lightning
{%endif %}
data:
data/nbxplorer: /data/.nbxplorer
data/btcpay: /data
user: 1000:1000
- name: postgres
nbxplorer:
depends_on:
- postgres
image: nicolasdorier/nbxplorer:2.3.28@sha256:62333c578aa85487f8f8e292b4a434272fd919ce8f2e58b2d23af6342dd92778
user: 1000:1000
environment:
NBXPLORER_DATADIR: /data
NBXPLORER_NETWORK: $BITCOIN_NETWORK
NBXPLORER_PORT: "32838"
NBXPLORER_BIND: 0.0.0.0
NBXPLORER_CHAINS: btc
NBXPLORER_SIGNALFILEDIR: /data
NBXPLORER_BTCRPCURL: http://$BITCOIN_IP:$BITCOIN_RPC_PORT
NBXPLORER_BTCNODEENDPOINT: $BITCOIN_IP:$BITCOIN_P2P_PORT
NBXPLORER_BTCRPCUSER: $BITCOIN_RPC_USER
NBXPLORER_BTCRPCPASSWORD: $BITCOIN_RPC_PASS
NBXPLORER_POSTGRES: User
ID=postgres;Host=$APP_BTCPAY_SERVER_POSTGRES_IP;Port=5432;Application
Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer${BITCOIN_NETWORK}
NBXPLORER_AUTOMIGRATE: "1"
NBXPLORER_NOMIGRATEEVTS: "1"
mounts:
data:
data/nbxplorer: /data
postgres:
image: ghcr.io/runcitadel/postgres:main@sha256:8f25afe966a63fd3f11a1052e73f30b9de5ddc0876bebaaf944d485374c73c01
user: 1000:1000
environment:
POSTGRES_HOST_AUTH_METHOD: trust
data:
- data/postgres:/var/lib/postgresql/data
mounts:
data:
data/postgres: /var/lib/postgresql/data

View File

@ -8,7 +8,7 @@ version: 3
metadata:
category: Development
name: code-server
version: 4.5.0
version: 4.5.2
tagline: Run VS Code on your Citadel
description: This app doesn't have a description yet.
developers:
@ -23,8 +23,9 @@ metadata:
defaultPassword: $APP_SEED
containers:
- name: server
image: codercom/code-server:4.5.0@sha256:7f8ba3e52cef1ea675b32062f045bcecbb59a5d0c657474dde18d6b2e9c3f96e
image: codercom/code-server:4.5.2@sha256:98c374514bb8560b1005ae8ffa4f5f65a553d2b49f8787e4af76210596b9c7e1
user: 1000:1000
port: 8080
environment:
PASSWORD: $APP_SEED
data:

View File

@ -9,7 +9,7 @@ citadel_version: 4
metadata:
category: Wallets
name: JAM
version: 0.0.6
version: 0.0.10
tagline: JoinMarket's awesome, man
description: JAM (JoinMarket's awesome, man) is a web-interface for JoinMarket
with focus on user-friendliness. It's time for top-notch privacy for your
@ -17,11 +17,11 @@ metadata:
privacy for all. The app provides sensible defaults and is easy to use for
beginners while still providing the features advanced users expect.
developers:
JAM developers: https://github.com/joinmarket-webui/joinmarket-webui
JAM developers: https://github.com/joinmarket-webui/jam
permissions:
- bitcoind
repo:
Public: https://github.com/joinmarket-webui/joinmarket-webui
Public: https://github.com/joinmarket-webui/jam
support: https://t.me/JoinMarketWebUI
gallery:
- 1.jpg
@ -33,7 +33,7 @@ metadata:
services:
main:
image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.6-clientserver-v0.9.6
image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.10-clientserver-v0.9.6
restart: on-failure
stop_grace_period: 1m
init: true
@ -42,16 +42,11 @@ services:
data:
data/joinmarket: /root/.joinmarket
environment:
ENSURE_WALLET: "1"
RESTORE_DEFAULT_CONFIG: "1"
RESTORE_DEFAULT_CONFIG: "true"
REMOVE_LOCK_FILES: "true"
ENSURE_WALLET: "true"
APP_USER: citadel
APP_PASSWORD: ${APP_SEED}
jm_tor_control_host: $TOR_PROXY_IP
jm_tor_control_port: "29051"
jm_onion_socks5_host: $TOR_PROXY_IP
jm_onion_socks5_port: $TOR_PROXY_PORT
jm_socks5_host: $TOR_PROXY_IP
jm_socks5_port: $TOR_PROXY_PORT
jm_rpc_host: $BITCOIN_IP
jm_rpc_port: $BITCOIN_RPC_PORT
jm_rpc_user: $BITCOIN_RPC_USER

View File

@ -24,7 +24,7 @@ metadata:
- 3.jpg
defaultPassword: $APP_SEED
containers:
- image: ghcr.io/runcitadel/lnbits-legends:feat-admin-password@sha256:f484cf3531d1bb14d95159fe2e7596f738e0991163190a7a346d594ec9bb80e5
- image: ghcr.io/runcitadel/lnbits-legends:feat-admin-password@sha256:ceb068a58eb0877235b43e0047a294634964b4057abda0ca8b9255310d914a27
command: sh -c 'uvicorn lnbits.__main__:app --port 5000 --proxy-headers --host
0.0.0.0 --forwarded-allow-ips "*"'
user: 1000:1000
@ -40,14 +40,14 @@ containers:
LNBITS_DEFAULT_WALLET_NAME: LNbits wallet
LNBITS_DISABLED_EXTENSIONS: amilk
LNBITS_ADMIN_LOGIN_KEY: $APP_SEED
LNBITS_ADMIN_EXTENSIONS: ngrok
LNBITS_ADMIN_EXTENSIONS: ngrok,admin
name: main-lnd
data:
- data:/data
restart: on-failure
requires:
- lnd
- image: ghcr.io/runcitadel/lnbits-legends:feat-admin-password@sha256:f484cf3531d1bb14d95159fe2e7596f738e0991163190a7a346d594ec9bb80e5
- image: ghcr.io/runcitadel/lnbits-legends:feat-admin-password@sha256:ceb068a58eb0877235b43e0047a294634964b4057abda0ca8b9255310d914a27
command: sh -c 'uvicorn lnbits.__main__:app --port 5000 --proxy-headers --host
0.0.0.0 --forwarded-allow-ips "*"'
user: 1000:1000
@ -61,7 +61,7 @@ containers:
LNBITS_DEFAULT_WALLET_NAME: LNbits wallet
LNBITS_DISABLED_EXTENSIONS: amilk
LNBITS_ADMIN_LOGIN_KEY: $APP_SEED
LNBITS_ADMIN_EXTENSIONS: ngrok
LNBITS_ADMIN_EXTENSIONS: ngrok,admin
name: main-c-lightning
data:
- data:/data

View File

@ -5,7 +5,6 @@
# yaml-language-server: $schema=../../app-standard-v3.yml
version: 3
metadata:
category: Explorers
name: Mempool
@ -41,7 +40,7 @@ metadata:
- Multiple languages support
- JSON APIs
developers:
developers:
mempool.space: https://mempool.space/about
dependencies:
- electrum

View File

@ -8,7 +8,7 @@ version: 3
metadata:
category: Files
name: Nextcloud
version: 24.0.2
version: 24.0.4
tagline: Your personal cloud
description: No description yet.
developers:
@ -44,7 +44,7 @@ containers:
data:
- data/redis:/data
- name: web
image: nextcloud:24.0.2@sha256:b319922a34539cfe7894000e635318634eb044b69e6c0182e8eea8957f3b42e9
image: nextcloud:24.0.4@sha256:69a52f571dc72f9ebbe222fc810f09d016173ec94f4423ea5e3d628496c1a5d5
port: 80
environment:
MYSQL_HOST: ${APP_NEXTCLOUD_DB_IP}
@ -60,7 +60,7 @@ containers:
- redis
data:
- data/nextcloud:/var/www/html
- image: nextcloud:24.0.2@sha256:b319922a34539cfe7894000e635318634eb044b69e6c0182e8eea8957f3b42e9
- image: nextcloud:24.0.4@sha256:69a52f571dc72f9ebbe222fc810f09d016173ec94f4423ea5e3d628496c1a5d5
entrypoint: /cron.sh
depends_on:
- db

View File

@ -5,11 +5,10 @@
# yaml-language-server: $schema=../../app-standard-v3.yml
version: 3
metadata:
category: Automation
name: Node-RED
version: 2.2.2
version: 3.0.2
tagline: Wire together the Internet of Things
description: >-
Node-RED is a visual programming tool for wiring together hardware devices,
@ -23,7 +22,7 @@ metadata:
Warning: Node-RED on Citadel is able to connect directly to Bitcoin Core, LND and Electrum, due to this you should be careful when installing third-party Node-RED nodes.
developers:
developers:
OpenJS Foundation: https://nodered.org
dependencies:
- bitcoind
@ -39,7 +38,7 @@ metadata:
torOnly: false
containers:
- name: web
image: nodered/node-red:2.2.1@sha256:8a668a56151705ea30603ea00fc5c009de412d100238dfdfe399d4cd2d62e28e
image: nodered/node-red:3.0.2@sha256:524316b9b84cb5bbfe006c117f3dad31ee806804b12e4b866047a65e2080e92d
stop_grace_period: 1m
data:
- data:/data

40
apps/oak-node/app.yml Normal file
View File

@ -0,0 +1,40 @@
citadel_version: 4
metadata:
name: Oak Node
version: 0.3.1
category: Automation
tagline: Do more with your LND node
developers:
Carlos: "https://oak-node.net"
permissions:
- lnd
repo:
Public: "https://oak-node.net"
support: "https://oak-node.net/forum"
gallery:
- 1.jpg
- 2.jpg
- 3.jpg
description: "Oak Node gives you Scheduled Payments. Now you can send sats to a Lightning Address on a schedule. Support your favorite content creators every week, every day, or even every block! Up to you.\n\nOak Node also includes an optional bot module for more advanced users."
services:
web:
image: "oak-node.net/oak:v0.3.1@sha256:f78f19763705dfb2237fd8a5c78f27052a848a5e56d89b3ffbcdc1edef0ba57e"
user: "1000:1000"
stop_grace_period: 1m
restart: on-failure
environment:
ROCKET_ADDRESS: 0.0.0.0
ROCKET_PORT: 8100
OAK_LND_MACAROON_PATH: /lnd-dir/data/chain/bitcoin/$BITCOIN_NETWORK/admin.macaroon
OAK_LND_REST_API_URL: "https://$LND_IP:$LND_REST_PORT"
OAK_DATA_DIR: /data
OAK_LND_CERT_PATH: /lnd-dir/tls.cert
port: 8100
mounts:
lnd: /lnd-dir
data:
log: /oak/log
data: /data

View File

@ -0,0 +1 @@

View File

@ -0,0 +1 @@

View File

@ -9,14 +9,20 @@ citadel_version: 4
metadata:
category: Lightning Node Management
name: Ride The Lightning
version: 0.12.3
version: 0.13.0
tagline: Manage lightning node operations better
description: Haven't written a description yet for this, sorry.
developers:
Shahana and Suheb: ridethelightning.info
permissions:
{% if services is containing("lnd") %}
- lnd
{% elif services is containing("c-lightning") %}
- c-lightning
{% else %}
- - lnd
- c-lightning
{% endif %}
- bitcoind
repo:
Public: https://github.com/Ride-The-Lightning/RTL
@ -28,31 +34,7 @@ metadata:
defaultPassword: $APP_SEED
services:
main-lnd:
image: ghcr.io/runcitadel/rtl:master@sha256:307cd8a9c449f2891ed21efa347bc0a51b132deff996920974ef41c5a39f633e
user: 1000:1000
port: 3000
environment:
PORT: "3000"
RTL_CONFIG_PATH: /data
CHANNEL_BACKUP_PATH: /data/backup
LN_IMPLEMENTATION: LND
LN_SERVER_URL: https://$LND_IP:$LND_REST_PORT
MACAROON_PATH: /lnd/data/chain/bitcoin/$BITCOIN_NETWORK
CONFIG_PATH: /lnd/lnd.conf
SWAP_SERVER_URL: https://$APP_RIDE_THE_LIGHTNING_LOOP_IP:8081
SWAP_MACAROON_PATH: /loop/.loop/$BITCOIN_NETWORK
BOLTZ_SERVER_URL: https://$APP_RIDE_THE_LIGHTNING_BOLTZ_IP:9003
BOLTZ_MACAROON_PATH: /boltz/.boltz-lnd/macaroons
APP_PASSWORD: $APP_SEED
mounts:
lnd: /lnd
data:
loop: /loop
boltz: /boltz
rtl: /data
requires:
- lnd
{% if services is containing("lnd") %}
loop:
image: ghcr.io/runcitadel/loop:main@sha256:9d57e9f6906741b643266735b8d1a63404475856ffaa8d12fcccd28bf8cf79fd
user: 1000:1000
@ -88,7 +70,8 @@ services:
- --rpc.rest.port="9003"
requires:
- lnd
main-cln:
{% endif %}
main:
image: ghcr.io/runcitadel/rtl:master@sha256:307cd8a9c449f2891ed21efa347bc0a51b132deff996920974ef41c5a39f633e
user: 1000:1000
port: 3000
@ -96,15 +79,32 @@ services:
PORT: "3000"
RTL_CONFIG_PATH: /data
CHANNEL_BACKUP_PATH: /data/backup
APP_PASSWORD: $APP_SEED
{% if services is containing("lnd") %}
LN_IMPLEMENTATION: LND
LN_SERVER_URL: https://$LND_IP:$LND_REST_PORT
MACAROON_PATH: /lnd/data/chain/bitcoin/$BITCOIN_NETWORK
CONFIG_PATH: /lnd/lnd.conf
SWAP_SERVER_URL: https://$APP_RIDE_THE_LIGHTNING_LOOP_IP:8081
SWAP_MACAROON_PATH: /loop/.loop/$BITCOIN_NETWORK
BOLTZ_SERVER_URL: https://$APP_RIDE_THE_LIGHTNING_BOLTZ_IP:9003
BOLTZ_MACAROON_PATH: /boltz/.boltz-lnd/macaroons
{% elif services is containing("c-lightning") %}
LN_IMPLEMENTATION: CLT
LN_SERVER_URL: https://$C_LIGHTNING_IP:3001
MACAROON_PATH: /c-lightning/certs
CONFIG_PATH: /c-lightning/config
APP_PASSWORD: $APP_SEED
ENABLE_OFFERS: "true"
{% endif %}
mounts:
{% if services is containing("lnd") %}
lnd: /lnd
{% elif services is containing("c-lightning") %}
c_lightning: /c-lightning
{% endif %}
data:
{% if services is containing("lnd") %}
loop: /loop
boltz: /boltz
{% endif %}
rtl: /data
requires:
- c-lightning

View File

@ -8,7 +8,7 @@ version: 3
metadata:
category: Wallets
name: Specter Desktop
version: 1.10.3
version: 1.10.5
tagline: Multisig with hardware wallets made easy
description: >-
Specter Desktop connects to the Bitcoin Core running on your Citadel and
@ -46,7 +46,7 @@ metadata:
- 2.jpg
- 3.jpg
containers:
- image: lncm/specter-desktop:v1.10.3@sha256:00be87ab89dd68587b61aceb073acd84fc3009c137c2dbb8ef155c5e22305562
- image: lncm/specter-desktop:v1.10.5@sha256:36eaa06f99f44e77d8fbffcbcd9c8b9d6ce9be24d060589ed05ad487d5b2f34b
stop_signal: SIGINT
command:
- --host=0.0.0.0

View File

@ -8,7 +8,7 @@ version: 3
metadata:
category: Lightning Node Management
name: ThunderHub
version: 0.13.14
version: 0.13.15
tagline: Take full control of your Lightning node
description: >-
ThunderHub allows you to take full control of your Lightning node with a
@ -31,7 +31,7 @@ metadata:
- 3.jpg
defaultPassword: $APP_SEED
containers:
- image: apotdevin/thunderhub:v0.13.14@sha256:6ee592a8335ec203f9c7056ddd22f286f8135b5888005d84db70787a91e3e72f
- image: apotdevin/thunderhub:v0.13.15@sha256:38189f0ec3df0d56980b0595f7d8eaa446dac922f937d2cda04a88dfc1866a51
environment:
NO_VERSION_CHECK: "true"
LOG_LEVEL: debug

View File

@ -10,7 +10,7 @@ citadel_version: 4
metadata:
category: Password Managers
name: Vaultwarden
version: 1.25.0
version: 1.25.2
tagline: Unofficial Bitwarden® compatible server
description: >-
Vaultwarden (formerly known as Bitwarden_RS) is an alternative
@ -46,9 +46,10 @@ metadata:
- 2.jpg
- 3.jpg
torOnly: true
services:
main:
image: vaultwarden/server:1.25.0@sha256:f3ebede27f1cf5e78373c3c4a429cf1fdd8d6b13528a2b9ca4fb3cb7cc681ba9
image: vaultwarden/server:1.25.2@sha256:39f34c5159a27dc9a16b2b7c07cec031622cdb174b4d99f09c8efefcd847d887
user: 1000:1000
port: 3000
environment:

View File

@ -8,7 +8,7 @@ citadel_version: 4
metadata:
name: WordPress
version: 5.9.3
version: 6.0.1
category: Blog
tagline: Host a blog on your Citadel
description: WordPress
@ -25,7 +25,7 @@ metadata:
services:
main:
image: wordpress:6.0.0-php8.1-apache@sha256:52cd45d183f98d406e4c01a79346216437480aa475ea04d3aaa0e64c6b1093d7
image: wordpress:6.0.1-php8.1-apache@sha256:8419d1eb8f357530354c98c400afc11a967f6a3cca5517f64645b1cc90b2f7af
depends_on:
- db
data: