Merge remote-tracking branch 'origin/deno' into beta

app/lib/manage.py

@@ -16,6 +16,7 @@ import shutil
 import json
 import yaml
 import subprocess
+import traceback
 try:
     import semver
 except Exception:
@@ -214,7 +215,7 @@ def update(verbose: bool = False):
                             print("Wrote " + app + " to " + composeFile)
         except Exception as err:
             print("Failed to convert app {}".format(app))
-            print(err)
+            print(traceback.format_exc())
         
     joinThreads(threads)
     print("Generated configuration successfully")

db/dependencies.yml

@@ -1,5 +1,5 @@
 compose: v2.10.2
 dashboard: ghcr.io/runcitadel/dashboard:v0.0.17@sha256:4416254a023b3060338529446068b97b2d95834c59119b75bdeae598c5c81d0e
-manager: ghcr.io/runcitadel/manager:v0.0.17@sha256:ba436a07d6f96282217851756d8c81aeaa03c42dfa2246a89a78fc3384eed3cb
+manager: ghcr.io/runcitadel/manager:deno@sha256:896b98ab270355d053203c8e4a31df449b447ff1ef91ef86b1b0907400db1bd6
 middleware: ghcr.io/runcitadel/middleware:main@sha256:2aa20f31001ab9e61cda548acbd1864a598728731ad6121f050c6a41503866ae
-app-cli: ghcr.io/runcitadel/app-cli:main@sha256:c1073222d380797355678471155297f491a667d0bfde743271554c8d9c4c7e17
+app-cli: ghcr.io/runcitadel/app-cli:main@sha256:6dad26faf652b930cb219a6261af8edfa84d5db4d679153700dbc1b136267bbf

docker-compose.yml

@@ -107,14 +107,11 @@ services:
         ipv4_address: $DASHBOARD_IP
   manager:
     container_name: manager
-    image: ghcr.io/runcitadel/manager:v0.0.17@sha256:ba436a07d6f96282217851756d8c81aeaa03c42dfa2246a89a78fc3384eed3cb
+    image: ghcr.io/runcitadel/manager:deno@sha256:896b98ab270355d053203c8e4a31df449b447ff1ef91ef86b1b0907400db1bd6
     depends_on:
     - tor
     - redis
-    command:
-    - ./start.sh
     restart: on-failure
-    init: true
     stop_grace_period: 5m30s
     volumes:
     - ${PWD}/info.json:/info.json
@@ -127,7 +124,6 @@ services:
     - jwt-public-key:/jwt-public-key
     - jwt-private-key:/jwt-private-key
     environment:
-      PORT: '3006'
       USER_PASSWORD_FILE: /db/user.json
       JWT_PUBLIC_KEY_FILE: /jwt-public-key/jwt.pem
       JWT_PRIVATE_KEY_FILE: /jwt-private-key/jwt.key

scripts/update/01-run.sh

@@ -148,11 +148,9 @@ for app in $("$CITADEL_ROOT/scripts/app" ls-installed); do
 done
 wait
 
-# If CITADEL_ROOT doesn't contain services/installed.json, then put '["electrs"]' into it.
-# This is to ensure that the 0.5.0 update doesn't remove electrs.
-if [[ ! -f "${CITADEL_ROOT}/services/installed.json" ]]; then
-  echo '["electrs"]' > "${CITADEL_ROOT}/services/installed.json"
-fi
+# Remove the nginx config (only for 0.0.9)
+# So it will be recreated
+rm -f nginx/nginx.conf
 
 # Start updated containers
 echo "Starting new containers"

templates/nginx-sample.conf

@@ -27,7 +27,7 @@ http {
 		}
 
 		location /manager-api/ {
-			proxy_pass http://<manager-ip>:3006/;
+			proxy_pass http://<manager-ip>:3000/;
 		}
 
 		# dashboard (old)