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

Merge branch 'stable' into beta

Browse Source
This commit is contained in:
AaronDewes 2022-06-01 16:44:19 +00:00
commit 5b2b5a4541
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/composegenerator/v3/types.py
View File

@ -38,7 +38,7 @@ class Container:
port: Union[int, None] = None port: Union[int, None] = None
requiredPorts: list = field(default_factory=list) requiredPorts: list = field(default_factory=list)
requiredUdpPorts: list = field(default_factory=list) requiredUdpPorts: list = field(default_factory=list)
preferredOutsidePort: Union[int, None] = None #preferredOutsidePort: Union[int, None] = None
requiresPort: Union[bool, None] = None requiresPort: Union[bool, None] = None
environment: Union[dict, None] = None environment: Union[dict, None] = None
data: list = field(default_factory=list) data: list = field(default_factory=list)

8
docker-compose.yml
View File

@ -2,7 +2,7 @@ version: '3.8'
services: services:
tor: tor:
container_name: tor container_name: tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 image: lncm/tor:0.4.7.7@sha256:3c4ae833d2fefbea7d960f833a1e89fc9b2069a6e5f360109b5ddc9334ac0227
user: toruser user: toruser
restart: on-failure restart: on-failure
volumes: volumes:
@ -15,7 +15,7 @@ services:
ipv4_address: $TOR_PROXY_IP ipv4_address: $TOR_PROXY_IP
app-tor: app-tor:
container_name: app-tor container_name: app-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 image: lncm/tor:0.4.7.7@sha256:3c4ae833d2fefbea7d960f833a1e89fc9b2069a6e5f360109b5ddc9334ac0227
user: toruser user: toruser
restart: on-failure restart: on-failure
volumes: volumes:
@ -26,7 +26,7 @@ services:
ipv4_address: $APPS_TOR_IP ipv4_address: $APPS_TOR_IP
app-2-tor: app-2-tor:
container_name: app-2-tor container_name: app-2-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 image: lncm/tor:0.4.7.7@sha256:3c4ae833d2fefbea7d960f833a1e89fc9b2069a6e5f360109b5ddc9334ac0227
user: toruser user: toruser
restart: on-failure restart: on-failure
volumes: volumes:
@ -37,7 +37,7 @@ services:
ipv4_address: $APPS_2_TOR_IP ipv4_address: $APPS_2_TOR_IP
app-3-tor: app-3-tor:
container_name: app-3-tor container_name: app-3-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208 image: lncm/tor:0.4.7.7@sha256:3c4ae833d2fefbea7d960f833a1e89fc9b2069a6e5f360109b5ddc9334ac0227
user: toruser user: toruser
restart: on-failure restart: on-failure
volumes: volumes:

3
scripts/update/.updateinclude
View File

@ -6,3 +6,6 @@ tor/torrc-apps-3
tor/torrc-core tor/torrc-core
electrs/electrs.toml electrs/electrs.toml
apps/docker-compose.common.yml apps/docker-compose.common.yml
services/bitcoin/*
services/electrum/*
services/lightning/*