michael.heier/citadel-core
1
0
Fork 1
mirror of https://github.com/runcitadel/core.git synced 2024-11-11 16:30:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/c-lightning' into liquid

Browse Source
This commit is contained in:
AaronDewes 2022-05-24 05:52:06 +00:00
commit 419522f138
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/lib/composegenerator/shared/const.py
View File

@ -15,14 +15,6 @@ def permissions():
'${LND_DATA_DIR}:/lnd:ro' '${LND_DATA_DIR}:/lnd:ro'
] ]
}, },
"c-lightning": {
"environment_allow": [
"C_LIGHTNING_IP"
],
"volumes": [
'${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
]
},
"bitcoind": { "bitcoind": {
"environment_allow": [ "environment_allow": [
"BITCOIN_IP", "BITCOIN_IP",
@ -52,7 +44,9 @@ def permissions():
"environment_allow": [ "environment_allow": [
"C_LIGHTNING_IP" "C_LIGHTNING_IP"
], ],
"volumes": [] "volumes": [
'${C_LIGHTNING_DATA_DIR}:/c-lightning:ro'
]
}, },
} }

6
app/lib/composegenerator/v3/generate.py
View File

@ -65,12 +65,12 @@ def convertDataDirToVolumeGen3(app: App) -> AppStage2:
container.volumes.append('${BITCOIN_DATA_DIR}:' + container.mounts.bitcoin) container.volumes.append('${BITCOIN_DATA_DIR}:' + container.mounts.bitcoin)
if container.mounts.c_lightning: if container.mounts.c_lightning:
if not 'c-lightning' in app.metadata.dependencies: if not 'c-lightning' in app.metadata.dependencies:
print("Warning: container {} of app {} defines lnd mount dir but doesn't request lnd permission".format(container.name, app.metadata.name)) print("Warning: container {} of app {} defines c-lightning mount dir but doesn't request c-lightning permission".format(container.name, app.metadata.name))
# Skip this container # Skip this container
continue continue
# Also skip the container if container.lnd_mount_dir contains a : # Also skip the container if container.lnd_mount_dir contains a :
if container.mounts.c_lightning.find(":") == -1: if container.mounts.c_lightning.find(":") == -1:
container.volumes.append('${C_LIGHTNING_DATA_DIR}:' + container.mounts.bitcoin) container.volumes.append('${C_LIGHTNING_DATA_DIR}:' + container.mounts.c_lightning)
del container.mounts del container.mounts
return app return app
@ -81,7 +81,7 @@ def createComposeConfigFromV3(app: dict, nodeRoot: str):
newApp: App = generateApp(app) newApp: App = generateApp(app)
for container in newApp.containers: for container in newApp.containers:
# TODO: Make this dynamic and not hardcoded # TODO: Make this dynamic and not hardcoded
if container.requires and "c-lightning" in container.requires: if container.requires and "lnd" in container.requires:
ignoredContainers.append(container.name) ignoredContainers.append(container.name)
container.ignored = True container.ignored = True
elif container.requires: elif container.requires:

2
docker-compose.yml
View File

@ -227,7 +227,7 @@ services:
ipv4_address: $ELECTRUM_IP ipv4_address: $ELECTRUM_IP
c-lightning: c-lightning:
container_name: c-lightning container_name: c-lightning
image: ghcr.io/runcitadel/c-lightning:main@sha256:ce7c30c858047c75ed13e88fda2d731db44627d6b238ad17c46cbef0c09aa67c image: ghcr.io/runcitadel/core-ln:main@sha256:827264070bb07b74d695ca8e6505a241c1a8fbbef84b7a88cdee258811eb3112
environment: environment:
LIGHTNINGD_NETWORK: bitcoin LIGHTNINGD_NETWORK: bitcoin
CL_REST_STATE_DIR: /data/.lightning CL_REST_STATE_DIR: /data/.lightning