michael.heier/citadel-core
1
0
Fork 1
mirror of https://github.com/runcitadel/core.git synced 2024-12-28 15:42:59 +00:00
Code Issues Projects Releases Wiki Activity

Replace _ with - in container names

Browse Source
This commit is contained in:
Aaron Dewes 2022-01-19 10:00:11 +01:00
parent 37197200e0
commit 28962674a8
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/app-manager.py
View File

@ -54,12 +54,12 @@ elif args.action == 'update':
else:
os.system(os.path.join(nodeRoot, "scripts", "configure"))
os.chdir(nodeRoot)
os.system("docker compose stop app_tor")
os.system("docker compose start app_tor")
os.system("docker compose stop app_2_tor")
os.system("docker compose start app_2_tor")
os.system("docker compose stop app_3_tor")
os.system("docker compose start app_3_tor")
os.system("docker compose stop app-tor")
os.system("docker compose start app-tor")
os.system("docker compose stop app-2-tor")
os.system("docker compose start app-2-tor")
os.system("docker compose stop app-3-tor")
os.system("docker compose start app-3-tor")
exit(0)
elif args.action == 'update-online':
updateRepos()
@ -69,12 +69,12 @@ elif args.action == 'update-online':
else:
os.system(os.path.join(nodeRoot, "scripts", "configure"))
os.chdir(nodeRoot)
os.system("docker compose stop app_tor")
os.system("docker compose start app_tor")
os.system("docker compose stop app_2_tor")
os.system("docker compose start app_2_tor")
os.system("docker compose stop app_3_tor")
os.system("docker compose start app_3_tor")
os.system("docker compose stop app-tor")
os.system("docker compose start app-tor")
os.system("docker compose stop app-2-tor")
os.system("docker compose start app-2-tor")
os.system("docker compose stop app-3-tor")
os.system("docker compose start app-3-tor")
exit(0)
elif args.action == 'ls-installed':
# Load the userFile as JSON, check if installedApps is in it, and if so, print the apps

12
docker-compose.yml
View File

@ -13,8 +13,8 @@ services:
networks:
default:
ipv4_address: $TOR_PROXY_IP
app_tor:
container_name: app_tor
app-tor:
container_name: app-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208
user: toruser
restart: on-failure
@ -24,8 +24,8 @@ services:
networks:
default:
ipv4_address: $APPS_TOR_IP
app_2_tor:
container_name: app_2_tor
app-2-tor:
container_name: app-2-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208
user: toruser
restart: on-failure
@ -35,8 +35,8 @@ services:
networks:
default:
ipv4_address: $APPS_2_TOR_IP
app_3_tor:
container_name: app_3_tor
app-3-tor:
container_name: app-3-tor
image: lncm/tor:0.4.6.8@sha256:c262923ffd0bd224a4a4123cf1c88eea11e2314566b7b7e8a1f77969deeb0208
user: toruser
restart: on-failure

2
scripts/update/01-run.sh
View File

@ -95,7 +95,7 @@ cat <<EOF > "$CITADEL_ROOT"/statuses/update-status.json
EOF
pkill -f "\./karen" || true
# Start updated containers
# Stop old containers
echo "Stopping old containers"
cat <<EOF > "$CITADEL_ROOT"/statuses/update-status.json
{"state": "installing", "progress": 67, "description": "Stopping old containers", "updateTo": "$RELEASE"}